Update clang-format options.

These settings are based on the agreements reached in pull request #81.
Merge pull request #90 from ahmedcharles/update_options

Update clang-format options.