replaced old logical_or with normal or
replaced old logical_or with normal or

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