more collector updates
Merge branch 'master' of github.com:/clinstid/energymon