setup.py pep8 changes
Merge remote-tracking branch 'origin'