write Schrödinger as Schrodinger in docstring to avoid problems with sphinx...
drop utf-8 marker since it didnt work...
fixed missing import
Merge branch 'master' of github.com:qutip/qutip