Fix some simple pep8 and pylint violations
Merge pull request #2863 from edx/sarina/violations

Fix some simple pep8 and pylint violations