pep8 fixes.
Merge pull request #223 from edx/christina/pep8

pep8 fixes.