python3 compatibility fixes
Merge branch 'master' of github.com:qutip/qutip