Merge pull request #209 from craigcitro/lint

Fix lint errors in apitools.