Fix some pep8 problems

The next commit will change the way we test pep8/pyflakes problems. Fix those
now so we won't need to fix on the same commit.

Change-Id: Ida11581a776445f09087a5890e6ee9f8c294de33