turned short discussion switch on by default
re-ordering routes
Merge pull request #1016 from guardian/json-format-route-fix

Re-ordering routes
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
Merge pull request #1015 from gidsg/discussion-switch

turned short discussion switch on by default
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
Test that the toggle class is applied to the article's primary image