Switch to clang-format 3.5
WIP