Merge branch 'newsites'
Merge branch 'master' of git://github.com/alphagov/redirector
Added subset tests for archive.education.gov.uk
Merge pull request #155 from rjc123/master

Subset tests for archive.education
Merge pull request #154 from rjc123/newsites

Prepublish DFE mappings
Resolve http://govuk.zendesk.com/tickets/92068
Merge pull request #156 from rjc123/newmappings

New mappings for next deploy
Adding current file to DFE generation
Merge pull request #157 from rjc123/newmappings

Adding current file to DFE generation
Revert Plan B workaround - not effective
Merge pull request #158 from rjc123/newmappings

Revert Plan B workaround - not effective
Launch DFE mappings
Merge branch 'newmappings'

Conflicts:
	data/mappings/dfe.csv
Merge branch 'master' of git://github.com/alphagov/redirector
Launch DFE Mappings
Merge pull request #160 from rjc123/master

Launch DFE mappings