Merge pull request #149 from guardian/discussion-switch

Discussion switch
added teamcity conf for new build agents
Added comment count switch
Merge pull request #150 from guardian/switches

Added comment count switch
new switch name, as can't restart an ab test
switch for story/articl swap
Merge pull request #152 from guardian/story-turkey-ab

Story turkey ab test
turn short discussion on by default