pep8 fixes
Merge pull request #60 from praekelt/feature/pep8-fixes

pep8 fixes