pep8 whitespace fixes
Merge pull request #5493 from hulu/whitespace-fixes

batch of pep8 whitespace fixes