pep8 all the things
pep8 the tests and some more bits and bobs
Merge pull request #45 from esc/pep8

pep8 all the things