Modified UKPD importer to fix timestamp issue
Merge branch 'master' of https://github.com/nilmtk/nilmtk
Added UKPD results also
Merge branch 'master' of https://github.com/nilmtk/nilmtk