qa_tests/risk:

Fixed the base risk QA test case class so that nose attributes work
properly. The involved simply renaming `run_tests` to `_run_tests`.

Without this fix, all of the risk QA tests are run even is you specify
`nosetests -a '!qa'`.
Merge pull request #995 from larsbutler/risk-qa-attr-fix

Fix for Risk QA test collection

[r=micheles]
calcs/base: Added in_queue progress counter
calcs/hazard/disagg/core:

Better wording of `info` level messages about task queue management
in disagg calc workflow.
Merge pull request #996 from larsbutler/recover-reverted-code

Recover some reverted status report code

[r=micheles]
calcs/hazard/general:

Solved a subtle bug where `parsed_source` records are duplicated if
an input model is reused. This results in a "leak" of sorts in the
number of overall tasks.

See https://bugs.launchpad.net/openquake/+bug/1098154.
tests/utils/helpers:

Added the `force_inputs` option to `run_risk_job_sp` and `run_hazard_job_sp`
so that users of these util functions specify whether `--force-inputs` is on
or off.
tests/calcs/hazard/general_test:

Added a test specifically for
https://bugs.launchpad.net/openquake/+bug/1098154.

If this test is run without the fix (see commit
434451cbd52901cdc601f953281f09f0ae2247e6), it will fail.
calcs/hazard/general:

PEP8 fixes; there were two new lines of excessive length.
Merge pull request #997 from larsbutler/task-count-bugfix

Fix for bug # 1098154

[r=micheles] [f=1098154]
export/hazard:

Added util function for organizing exported hazard curve results by
GMPE and IMT.
tests/export/hazard_test:

Added test for `_get_end_branch_export_path`.
tests/export/hazard_test:

Fixed a typo in test case class name
export/hazard:

Added missing argment in call to `_get_end_branch_export_path` in hazard
curve export function.
tests/export/hazard_test:

Added missing export test for disaggregation.
export/hazard:

Disagg results/exports are now organized into the same folder structure
as hazard curves.
PEP8-consistency changes
Big simplification of GroundMotionValuesGetter
Merge pull request #998 from larsbutler/haz-result-export-dir-structure

Hazard curve and disagg. result exports are now organized by GMPE and IMT

[r=micheles] [f=1097624]
export/hazard:

Added handling for the case where the GMPE logic tree contains two
branching levels. In this situation, the export dir is a concatentation
of the GMPE names, joined by _.