Tweaked step on renweable electricity in 2020 control
Rearranged model and added more outputs
Model now updates to overall emissions, not emissions factor
Added non-electricity emissions control