PEP8 and Pylint fixes
Merge pull request #28 from chadlung/master

PEP8 and Pylint fixes