fix minor bugs and unit tests for qip.models.cqed
Merge branch 'cleanup-module-namespaces' of https://github.com/jrjohansson/qutip into cleanup-module-namespaces