Fix pylint-reported errors
Merge pull request #32 from bcrochet/pylint_fixes

Fix pylint-reported errors