a few simple tweaks
Merge branch 'master' of github.com:nilmtk/nilm_metadata

Conflicts:
	schema/dataset.json