PEP8 compliance
Cleaned up conflicts
Merge pull request #6 from citoic/stuff

PEP8 compliance