Adding automatic creation of SI magnitude units and abbreviations for SI units.
Merging in upstream changes.
Adding 'Energy' unit for storing joules/calories/Calories.