Drafted form discrepancy heuristics

Note that I still have a problem with matching up club names coming
from different data sources