Pep8 cleaning.
Merge pull request #230 from edx/christina/pep8-again

Pep8 cleaning.