pep8 cleanup
Merge pull request #2296 from edx/cdodge/pep8-fix

pep8 cleanup