Loads of PEP8 clean up
Merge branch 'master' into release/1.0.0