New algorithm for proportion_of_energy_submetered works.  But I
suspect i can make it prettier...