Merge branch 'master' of git://github.com/alphagov/redirector into newmappings
Merge branch 'master' of git://github.com/alphagov/redirector into newmappings
New FCO mappings
Merge pull request #128 from rjc123/newsites

education.gov.uk as valid redirect domain in whitelist
New DWP mappings - close to ready for launch
Merge pull request #129 from rjc123/newmappings

New Mappings for DWP launch
carry options through to munge
Changed backslash encoding error
Adding query string support for relevant sites (DECC, DFID, DFT, HOMEOFFICE, SCOTLAND)
New mappings for FCO
Reverting error in querystrings for home office
Merge pull request #131 from rjc123/newmappings

New mappings for FCO, with query strings
Merge pull request #130 from rjc123/fixquery

Adding query string support for relevant sites (DECC, DFID, DFT, SO)
New mappings after querystring support implemented
Merge pull request #132 from rjc123/newmappings

New mappings after querystring support implemented
Adding query strings to DECC
New home office mappings
New defra mappings
New DFT mappings
New mappings for DWP