Pep8 and pyflakes cleanup
Merge pull request #8 from jkoelker/pep8

Pep8 and pyflakes cleanup