Polished off FormHeuristics and created ClubNameMatcher to handle club alias issues