Removed switch for item redirects
Fixed what happens when a Short URL ends up on the wrong server
Merge branch 'master' of github.com:guardian/frontend into item-redirects

Conflicts:
	dev-build/app/Global.scala
Merge pull request #2178 from guardian/item-redirects

Item redirects