Remove all pep8 style errors
Merge pull request #12 from larsbutler/pep8-cleanup

PEP8 cleanup