Addresses https://github.com/nilmtk/nilmtk/issues/84#issuecomment-31738335
Addresses https://github.com/nilmtk/nilmtk/issues/84#issuecomment-31738335

jaduimstra/nilmtk,mmottahedi/nilmtk,AlexRobson/nilmtk,nilmtk/nilmtk,josemao/nilmtk,HarllanAndrye/nilmtk,pauldeng/nilmtk,nilmtk/nilmtk