changes to combed
Merge branch 'master' of https://github.com/nilmtk/nilmtk
closes #314