cleanup a few overlong lines and trailing ws, etc.
Merge remote-tracking branch 'origin/master' into cleanup
Merge pull request #104 from regehr/cleanup

cleanup a few overlong lines and trailing ws