code cleanup, logical bug fix, pep8ification
code cleanup, logical bug fix, pep8ification

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