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.
Changed type == 'super' to issuper, etc.
Added composite() as discussed in #241.
Merge pull request #241 from cgranade/master

Add operator-ket and operator-bra support to super_tensor.