changed return type of getEnergyMix to EmissionFactor
Merge branch 'master' of https://github.com/ajaggi/eaticious.git