Cater for GivenStories notation in .story files
Add better support for the Gherkin-style story format.