Moved clang-format requirement back to 3.7.
This MR puts the required version of clang-format back to 3.7 as there is currently another incompatibility with 3.6. It also puts back the option previously removed in an effort to make it compatible with 3.6.