Mostly whitespace changes made with the autopep8 tool
Merge pull request #3 from gazzar/reformatted

Reformatted