Cleaning up TaxonName methods, tweaks to core_taxon stuff.
Merge