added MWh to energy units
added MWh to energy units

mbmcgarry/cyan,gidden/cyan,rwcarlsen/cyan,gidden/cyan,gidden/cyan,mbmcgarry/cyan,mbmcgarry/cyan,gidden/cyan,rwcarlsen/cyan,rwcarlsen/cyan,mbmcgarry/cyan,rwcarlsen/cyan