Committed rough version of wikipedia disambiguator