PEP8ify everything that makes sense
Merge pull request #756 from irskep/pep8-pass

PEP8ify everything that makes sense