Remove more pep8 violations
Merge pull request #5828 from edx/sarina/moar-pep8

Remove more pep8 violations