Merge branch 'distribute_by_taxonomy' of http://github.com/matley/oq-engine into 1100776
Removed VulnerabilityModel and functions from the data model: now they lives in the db only as xml input files only
Merged from master
Substantial simplification of the data model from the scenario_damage calculator
Removed a forgotten reference to CollapseMap
Restored the lsi concept in the db, even if it is missing in the XML
Simplified the damage_state foreign keys
Added an index on dmg_state(output_id)
Removed a dependency from shapes
Added an index riskr_dmg_state_lsi_idx
Merge pull request #1015 from gem/1100776

Simplify the data model for the scenario_damage risk calculator