Merge pull request #104 from ctiller/clangfmt

Use clang-format-3.5