Merge pull request #48 from jhlch/pep8-fixes

Improve compliance with pep8. Fixes #49
Reverted pep8 changes to files that don't need it
Manually fixed some auto pep8 style choices