more mostly-whitespace pep8 fixes
Merge pull request #5520 from hulu/pep8-more

more mostly-whitespace pep8 fixes