Latest version, with mapping changes.

Contains new mappings. to_s error in energy imports fixed.
Spare copy of working gem.