added state-based metrics
Merge branch 'master' of https://github.com/nilmtk/nilmtk

Conflicts:
	nilmtk/metrics.py