Tidy code as per suggestion by @gklopper

Conflicts:
	archive/app/controllers/ArchiveController.scala
Avoid confusion over shadowed val names

Conflicts:
	archive/app/controllers/ArchiveController.scala
Stop redirect loops

Conflicts:
	archive/app/controllers/ArchiveController.scala
Fix test
Merge pull request #3350 from guardian/stop-infinite-redirects

Stop infinite redirects