Merge pull request #341 from rjc123/master

Resolve zendesk https://govuk.zendesk.com/tickets/278292
Merge pull request #342 from rjc123/master

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

remove space, pass tests
Merge pull request #344 from rjc123/master

Add back suggested links lost in automunge