PEP 8 cleanup
Merge pull request #33 from ebolad/pep8-cleanup

PEP 8 cleanup