Merge pull request #219 from rjc123/master

research.dwp pre-launch mappings, including manual mappings
removed spurious { from the dwp mappings
removed directgov_subdomains.conf from Makefile
more spurious cruft in dwp mappings