style: fix style errors cpplint finds; annotate the ones it's wrong about
Merge pull request #146 from pagespeed/jefftk-lint-fixes

style: fix style errors cpplint finds; annotate the ones it's wrong about