Remove the canary code (It never caught on really)
should allow the forcing of users in to a given test and variant
jshint fixes
Allow forcing in to the AB test via the query string
force segmentation OR segment, not *both*
Revert "Remove the canary code (It never caught on really)"

This reverts commit a262fd6b8215efc9a6b61ab4bb7cc38c690c8132.

Conflicts:
	common/app/assets/javascripts/bootstraps/app.js
Make sure we can override an existing value
Merge pull request #1514 from guardian/ab-test-optin

Ab test opt-in/out