Fixes replacement of .nxdl at the end of the definition file
Change logic of ordering the replacement of cations in formulas to start with the shortest abbreviations first
Change logic of ordering the replacement of cations in formulas to start with the shortest abbreviations first