improve pep8 conformity of setup.py
Merge branch 'develop' into develop.osx