Merge branch 'master' of http://github.com/jrjohansson/qutip
Merge branch 'extend-about' of http://github.com/jrjohansson/qutip
Merge branch 'master' of http://github.com/qutip/qutip
updates function signature of d1 and d2 functions
Merge branch 'master' of http://github.com/qutip/qutip
attempt ot fix np.array with Qobj problem by adding dtype=object
Merge pull request #231 from jrjohansson/stochastic-updates

update function signature of d1 and d2 functions
Merge branch 'master' of http://github.com/qutip/qutip into numpy-1.9-compatibility-issues
Merge pull request #232 from jrjohansson/numpy-1.9-compatibility-issues

Numpy 1.9 compatibility issues
Merge pull request #233 from jrjohansson/cleanup-module-namespaces

Cleanup module namespaces