[#55983438] added and re-ordered taxonmy
Merge pull request #478 from NREL/55983438_MeasureTaxonomyUpdate

[#55983438] added and re-ordered taxonmy