Merge pull request #271 from jrjohansson/parallel-updates

qutip.parallel updates
Merge branch 'master' into refactor-mcsolve-parallel