Removed some pep8 violations.
Merge pull request #316 from edx/jnater/pep8_fixes

Removed some pep8 violations.