fixed bug in fraction_energy_assigned_correctly
Merge branch 'master' of https://github.com/nilmtk/nilmtk