total_demand_merit_fix

Renamed energy_sector_final_demand_for_electricity to energy_sector_own_use_electricity and removed it from the total_demand_for_electricity function. This fixes the double counting introduced by also adding energy_power_sector_own_use_electricity to the final_demand converter group. Fixes https://github.com/quintel/merit/issues/119