Merge pull request #337 from rjc123/newmappings

Merge to resolve branch differences
Merge pull request #338 from rjc123/newmappings

Resolve duplicate mapping
Merge pull request #339 from rjc123/newmappings

Second run of automunge
Make it clear what migration we're talking about

Reducing cognitive overhead is good.
Merge pull request #340 from alphagov/clarify_still_to_migrate_filename

Make it clear what migration we're talking about
Resolve zendesk https://govuk.zendesk.com/tickets/278292
Merge pull request #341 from rjc123/master

Resolve zendesk https://govuk.zendesk.com/tickets/278292
New mappings to resolve https://www.pivotaltracker.com/story/show/51707691
Merge pull request #342 from rjc123/master

New mappings to resolve https://www.pivotaltracker.com/story/show/517076...
remove space, pass tests
Merge pull request #343 from rjc123/master

remove space, pass tests
Add suggested links for dfid
Ignore DFID and CabinetOffice in Automunge - lost suggested links or truncated mapping
Merge pull request #344 from rjc123/master

Add back suggested links lost in automunge
Merge dfid changes on rebase