Set @location instance var in prepare_publication_and_environment

Reduces the number of methods setting instance vars
Move setting of instance vars out of prepare_publication_and_environment to actions
Move responsibility for handling 'done' slugs to routes.rb

Using a glob parameter and a constraint in routes.rb means we don't
need to stitch the parameters together in the controller in order
to handle 'done' pages.
Move filtering of requests with no format to before_filter
Break prepare_publication_and_environment in two

Half the method constructed objects, half then set headers based on those.
These feel like two methods.
Remove stray ]
Output country synonyms into the HTML as data attr
Use the synonyms in the HTML data attribute

Synonyms no longer defined in the JS but through the TA Publisher tool.
Outputted into the HTML. This JS picks them up and allows them to be
used in the filtering.
pipe delimited in the frontend rather than commas
Give the cookie upgrade heading a unique id
Add section on survey cookies
Change the survey cookie name to meet the style guide
Use a th tag for cookie names in the cookie table
Add horizontal rule before survey section
Move test for unrecognised format handling to integration suite

This logic's now in a before_filter so a functional test doesn't
pick it up.
Merge branch 'master' into simplify-publication_and_environment
Fix constraints on 'done' routes

For some reason rails doesn't apply constraints on glob matches properly
but does apply them if they's simply specified as the parameter name.
https://github.com/rails/rails/issues/7924
Revert "Move test for unrecognised format handling to integration suite"

This reverts commit 0ce59bd10e2827760088443875dfc8d040225a96.
Apply block_empty_format before_filter to correct actions
Merge branch 'master' into simplify-publication_and_environment

Conflicts:
	config/routes.rb