getting rid of reweighting
Merge branch 'master' of https://github.com/adrianalbert/EnergyAnalytics