PEP8 cleanup
PEP8 cleanup
Merge pull request #15 from boblefrag/master

PEP8 cleanup