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