[#1062] Toby is stupid

Conflicts:

	ckan/templates/admin/config.html
	ckan/templates/admin/index.html
	ckan/templates/footer.html
	ckan/templates/package/search.html