Adding Energy unit 'Joule/Calorie/calorie'
Merging in upstream changes.
Adding 'Energy' unit for storing joules/calories/Calories.