Remove clang-format parameters that break clang-format 3.4

I don't know if this breaks formatting rules that are important to you, but this is what was required for me to run `make format` without error using `clang-format` 3.4.

Fixes #263