Merge branch 'new-risk-demos' of https://github.com/matley/oq-engine
Merge branch 'new-risk-demos' of https://github.com/matley/oq-engine
Removed obsolete script from setup.py
Merge branch 'master' of github.com:gem/oq-engine into fixed-setup
Merge pull request #1326 from gem/fixed-setup

Fixed setup.py