made setup.py pep8 compatible
pep8 fixes
Merge branch 'master' of https://github.com/qutip/qutip