Update clang-format options.

These settings are based on the agreements reached in pull request #81.

This isn't complete yet, let me know if I missed something.