Update style (and move to clang-format 3.6)