Merge pull request #149 from rjc123/master

Revert DECC files with querystrings not handled by nginx
Merge pull request #150 from rjc123/master

Remove other random query strings
Reset
Merge branch 'master' of git://github.com/alphagov/redirector

Conflicts:
	data/sites/ukef.yml
	tests/lib/url.php
	tests/tools/site_hosts_test.rb
	tools/count_mappings.sh
	tools/escape_commas_in_urls
	tools/ingest-new-mappings.rb