fixed issues from review
Merge pull request #23 from jrjohansson/qutip-fixes

Johansson: Fix issues from review