Update clang-format options.

These settings are based on the agreements reached in pull request #81.