Cleanup clang-format settings.

This doesn't change the settings, just fixing some issues that weren't
noticed before.
Merge pull request #80 from ahmedcharles/options

Cleanup clang-format settings.
Remove dead code.