tests/utils/helpers:

Simplified and corrected a util function.
engine:

Fixed the file parsing in `parse_config`. The file dict returned by
this function is now properly keyed by the parameter name (example:
"exposure_file") instead of the input type (example: "exposure").

There are corresponding changes in `create_hazard_calculation` and
`create_risk_calculation`.
engine:

Updated/corrected docstring for `parse_config`.
tests:

Updated tests to run properly with the changes to `engine.parse_config`.
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 branch 'file-parsing-fix' of https://github.com/larsbutler/oq-engine
Merge branch 'file-parsing-fix' of https://github.com/larsbutler/oq-engine
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
Merge branch 'master' of http://github.com/gem/oq-engine
ensure building the fixtures in a proper order
Added a tests checking that setval is called correctly
reload riskcalculation object in test helpers
Merge pull request #1248 from matley/update-scenario-fixtures

Update test fixtures used for risk scenario calculations
Fixed the args parsing for the script restore_hazards
Merge pull request #1251 from gem/restore_hazards_args_parsing

Small fixes to the script restore_hazards.py
implemented nulltextfield