pep8
Merge pull request #29 from vjanelle/pep8

pep8.
ok - I'm starting to pep8 myself on code I touch now