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
Merge branch 'master' of http://github.com/qutip/qutip
attempt ot fix np.array with Qobj problem by adding dtype=object
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 remote-tracking branch 'upstream/master'

Unifying function signatures for sso.d1, sso.d2, 6 other recent commits.