Refactoring of risk calculators

Addresses https://bugs.launchpad.net/oq-engine/+bug/1175702

While addressing such issue, I have found a couple of minor bug that have been fixed (in computing maps in event based calculator).