Initial version of actual annual energy use.
Improve average-reading fn
Merge pull request #72 from MastodonC/feature/calculated-fields

Initial version of actual annual energy use.