Merge pull request #1 from qutip/master

Pull from upstream
First attempt at making super_tensor work for states. See #238.
Merge branch 'master' of github.com:cgranade/qutip

Conflicts:
	qutip/permute.py
	qutip/tensor.py
	qutip/tests/test_qobj.py
Forgot an import in new unit test.
Fixed bug in permute. Unit tests now pass locally.
Merge pull request #240 from jrjohansson/fix-issue-237

Fix issue #237
Changed type == 'super' to issuper, etc.
Merge pull request #242 from jrjohansson/fix-issue-237

replace double .H with double .T as @cgranade suggested
Added composite() as discussed in #241.
Merge pull request #241 from cgranade/master

Add operator-ket and operator-bra support to super_tensor.
raise errors if zvode fails in mesolve and sesolve
pep8 fixes
Update to build_preconditioner

build_preconditioner now raises exception when preconditioning fails
use a different initial state to get a more meaning ful correlation test (otherwise the correlation is zero). increase the allowed error to reduced number of false test failures
put initial state back in the ground state to correspond to docstring
Merge pull request #243 from jrjohansson/improve-me-se-zvode-failure-handling

Improve me se zvode failure handling
cleanup setup.py
pep8 fixes
pep8 fixes
pep8 fixes