made __str__ return string instead of using print
Merge branch 'master' of github.com:qutip/qutip