Added kWh/h support
Merge branch 'master' of https://github.com/comcute/emoncms