pep8 cleanup
Merge pull request #11 from jlintz/pep8_cleanup

pep8 cleanup