Addresses #217. Still need to address https://github.com/nilmtk/nilm_metadata/issues/15