pep8 compliant
Merge pull request #29 from gerbal/pep8

Proper, grown up pep8 compliant style