Update GherkinBDD to Gherkin, readd travis version check
Clean up spaces