Add sources of electricity generation, with on-site use factor
Merge branch 'v3' of https://github.com/emoncms/openbem into v3