Got rid of the craziness of passing the singleton Switch object around.

This is just a cleanup before I do the 410s, it touches lots of files so I am doing it separately.
Not quite yet...
Merge branch 'master' of github.com:guardian/frontend into 410-gone
Merge branch 'master' of github.com:guardian/frontend into 410-gone
Merge pull request #2329 from guardian/410-gone

Got rid of the craziness of passing the singleton Switch object around.