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