add support for version strings ending in 'aX'
Merge branch 'master' of https://github.com/jrjohansson/qutip
Merge branch 'master' of https://github.com/jrjohansson/qutip
remove some unused imports
remove unused imports in qobj.py
add missing progress_bar argument
fix code style errors
unused variable
remove unused variables and modules
Merge pull request #225 from jrjohansson/minor-code-cleanup

Minor code cleanup