Consolidating nexml import
Consolidating nexml import

This change only corrects code that is commented out. But
if we ever uncomment it, this should fix (the phylesystem-api part
of):
    https://github.com/OpenTreeOfLife/phylesystem-api/issues/86
Untested commit.

OpenTreeOfLife/phylesystem-api,OpenTreeOfLife/phylesystem-api,OpenTreeOfLife/phylesystem-api