Update setup.py to install new modules

Also checks for pyqi library. Fixes #166.
Update citation in setup.py
Merge pull request #190 from jrrideout/death-march

Update setup.py to install new modules