pep8 fixes
Resolving conflicts
Merge pull request #2 from lowks/master

Awesome. :)