Pylint errors
Merge pull request #321 from edx/cale/pylint-errors

Pylint errors