merge
include control in module list in setup.py
Merge branch 'feature-control' of https://github.com/jrjohansson/qutip into feature-control