Add Angstrom to possible "energy" units in GEnergy and use GEnergy unit conversion in GMWLSpectrum.