Some pep8.
Finished pep8 pass.
Merge pull request #57 from ralphbean/feature/pep8

Some pep8.