Changes to be committed:
	modified:   nilmtk/dataset_converters/greend/metadata/building1.yaml
	modified:   nilmtk/dataset_converters/greend/metadata/meter_devices.yaml
Merge pull request #162 from pilillo/master

 Changes to be committed: