engine:

Made `get_or_create_input` a bit more dry (rearranged some duplicated
code).
calcs/hazard/general:

Made the "parsing risk models" PROGRESS message conditional. If the
hazard geometry is not specified in a risk model (exposure), we
shouldn't display this message at all.
Merge pull request #1246 from larsbutler/file-parsing-fix

File parsing fix

[r=micheles] [f=1214301]
Merge pull request #1247 from larsbutler/small-tweaks

Trivial: Some small tweaks/cleanups

[r=micheles] [f=*trivial]
fixtures regenerated
Merge branch 'master' of https://github.com/gem/oq-engine into update-scenario-fixtures
ensure building the fixtures in a proper order
reload riskcalculation object in test helpers
Merge pull request #1248 from matley/update-scenario-fixtures

Update test fixtures used for risk scenario calculations
merge commit