UPDATED: fixed missing linspace errors
UPDATED: fixed import errors
FIXED: import errors
FIXED: import errors
Merge branch 'master' of github.com:qutip/qutip-doc into qutip-2.2.X