Energy units reverted

Yep, that so.
Merge pull request #41 from Adaptivity/patch-1

Energy units reverted