Fix some pylint issues
Merge pull request #542 from edx/db/fix-pylint

Fix some pylint issues