wiki_disambig.py: Fix a few remaining bugs, factor out some code
wiki_disambig.py: Fix a few remaining bugs, factor out some code

utcompling/textgrounder,utcompling/textgrounder,utcompling/textgrounder