I still think that 80 characters is too restrictive
Merge pull request #22 from LordAro/master

I still think that 80 characters is too restrictive
Merge recent clang-format changes.

This should have been done at the start (as a rebase), but I forgot.  Silly me.