Remove clang-format parameters that break clang-format 3.4
Merge pull request #343 from zwass/clang-format-fix

Remove clang-format parameters that break clang-format 3.4