PEP8

Re-factored most of the code to follow PEP8 guidelines.
Merge pull request #1 from jasonnator/master

PEP8