Incidental pep8 changes
Merge pull request #207 from edx/dhm/pep8

pep8 changes made during long refactoring