some pep8 fixes, mostly whitespace
Merge pull request #5512 from hulu/pep8-mostly-whitespace

some pep8 fixes, mostly whitespace