Merge pull request #201 from rjc123/newsites

New mappings for upcoming DWP statistics and research domains
options triggers maps included in nginx conf
removed bespoke decc nginx conf file
Merge pull request #202 from alphagov/maps_in_templates

Maps in templates
fixed foi.fco.gov.uk/en/about-us
Change to whitelist