Another round of fixes
Lots of deduping enhancements

Added several more match categories, which introduce several thousand
good matches.

Fixed the way we rewrite the names.conf, to favor alpha entries as the
lead.
Another huge round

One more major tweak to the code, so that the names.conf file tends to
use an alpha name.  The various pieces led to another thousand or so
matches.