Add mappings and canonicalise
Remove unnecessary DirectGov rule
Merge pull request #750 from rjc123/directgov

Replace Directgov rule with mappings