optionally skip wavefunction normalization. reorganized arguments  in internal functions
optionally skip wavefunction normalization. reorganized arguments  in internal functions

zasdfgbnm/qutip,zasdfgbnm/qutip,qutip/qutip,anubhavvardhan/qutip,cgranade/qutip,anubhavvardhan/qutip,cgranade/qutip,qutip/qutip