diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2a08b60
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,34 @@
+# Editor Config File
+# Top-most EditorConfig file
+root = true
+# Rules that apply to all files
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+# for shell scripts always use lf line endings
+[*.{sh,bash}]
+end_of_line = lf
+indent_size = 4
+
+# For shell scripts on windows:
+[*.{bat,cmd,ps1}]
+end_of_line = crlf
+
+# Vscode likes json to use tabs typically
+[*.{json,code-workspace}]
+indent_style = tab
+
+# this one has space based indentation
+[package.json]
+indent_style = space
+
+# Build and output files shouldn't use editorconfig
+# Turn off all settings for output files.
+[**/{node_modules,out,dist}/**/*]
+charset = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 6c3f4f9..4bc4650 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ install:
   - ./ci-install.sh
 
 script:
- - ./ci-build.sh
+  - ./ci-build.sh
 
 notifications:
   email:
diff --git a/package.json b/package.json
index 140f6c6..686c7ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cucumber",
-    "version": "0.11.5",
+    "version": "0.12.0",
     "engines": {
         "vscode": "^0.10.0"
     },
@@ -63,4 +63,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/snippets/snippets.json b/snippets/snippets.json
index 8bf13b5..a5ccaa4 100644
--- a/snippets/snippets.json
+++ b/snippets/snippets.json
@@ -11,7 +11,7 @@
 		"description": "When Step (Plaintext)",
 		"scope": "text.gherkin.feature"
 	},
-    "giv-rb": {
+	"giv-rb": {
 		"prefix": "giv",
 		"body": "Given ${1:step name} do\r\n  $0\r\nend",
 		"description": "Given Step (Ruby)",
@@ -28,7 +28,8 @@
 		"body": ["Scenario Outline: ${1:title}",
 				"\tGiven ${2:context}",
 				"\tWhen ${3:event}",
-				"\tThen ${4:outcome}"],
+				"\tThen ${4:outcome}\r\n",
+                "$0"],
 		"description": "Scenario Outline",
 		"scope": "text.gherkin.feature"
 	},
@@ -37,7 +38,8 @@
 		"body": ["Scenario: ${1:title}",
 				"\tGiven ${2:context}",
 				"\tWhen ${3:event}",
-				"\tThen ${4:outcome}\r\n$0\r\n$0"],
+				"\tThen ${4:outcome}\r\n",
+                "$0"],
 		"description": "Scenario",
 		"scope": "text.gherkin.feature"
 	},