just ran pycharm's 'format source code' to get it into a more sane state
minor manual pep8 fixes (whitespace)
more fixes for stuff found by pep8.py
Merge pull request #7 from ThomasWaldmann/master

just ran pycharm's 'format source code' to get it into a more sane state