allow for both deterministic and stochastic collapse operators in smesolve
Merge branch 'master' of github.com:qutip/qutip