Make pylint happy
Make pep8 happy
Merge pull request #2 from daenney/pylint

Make pylint happy