Simplified the risk calculators

See https://bugs.launchpad.net/oq-engine/+bug/1376157. Requires https://github.com/gem/oq-commonlib/pull/46 and https://github.com/gem/oq-risklib/pull/79.
Tests are running here: https://ci.openquake.org/job/zdevel_oq-engine/774
You mean the comment? It looks correct to me.