Fix results aggregation, supply-demand interaction
Fix results aggregation, supply-demand interaction

Aggregating according to a simplified list of heating technologies must
sum up any grouped technologies.

Fix is to test if entry exists in dict and create if missing,
otherwise add values rather than overwriting.

nismod/energy_demand,nismod/energy_demand