Better distinguish ambiguous taxon names
More tests
Fixed bug where not all nodes in lineage were merged in tree