Huge PEP8 cleanup
Merge pull request #52 from nens/jackie-sync

PEP8 cleanup