more cpplint fixes
Merge branch 'master' of github.com:nschloe/Nosh