Remove branch alias for 3.0 branch

Update .editorconfig

.editorconfig

@@ -14,6 +14,9 @@ trim_trailing_whitespace = true
 indent_size = 2
 indent_style = space
 
+[composer.json]
+indent_size = 4
+
 # The indent size used in the package.json file cannot be changed:
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
 

composer.json

@@ -1,55 +1,50 @@
 {
-  "name": "silverstripe/behat-extension",
-  "type": "behat-extension",
-  "description": "SilverStripe framework extension for Behat",
-  "keywords": [
-    "framework",
-    "web",
-    "bdd",
-    "silverstripe"
-  ],
-  "homepage": "http://silverstripe.org",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Michal Ochman",
-      "email": "ochman.d.michal@gmail.com"
+    "name": "silverstripe/behat-extension",
+    "type": "behat-extension",
+    "description": "SilverStripe framework extension for Behat",
+    "keywords": [
+        "framework",
+        "web",
+        "bdd",
+        "silverstripe"
+    ],
+    "homepage": "http://silverstripe.org",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Michal Ochman",
+            "email": "ochman.d.michal@gmail.com"
+        },
+        {
+            "name": "Ingo Schommer",
+            "email": "ingo@silverstripe.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.6",
+        "phpunit/phpunit": "^5.7",
+        "behat/behat": "^3.2",
+        "behat/mink": "^1.7",
+        "behat/mink-extension": "^2.1",
+        "behat/mink-selenium2-driver": "^1.3",
+        "symfony/dom-crawler": "^3",
+        "silverstripe/testsession": "^2.0.0@alpha",
+        "silverstripe/framework": "^4@dev",
+        "symfony/finder": "^3.2"
     },
-    {
-      "name": "Ingo Schommer",
-      "email": "ingo@silverstripe.com"
-    }
-  ],
-  "require": {
-    "php": ">=5.6",
-    "phpunit/phpunit": "^5.7",
-    "behat/behat": "^3.2",
-    "behat/mink": "^1.7",
-    "behat/mink-extension": "^2.1",
-    "behat/mink-selenium2-driver": "^1.3",
-    "symfony/dom-crawler": "^3",
-    "silverstripe/testsession": "^2.0.0@alpha",
-    "silverstripe/framework": "^4@dev",
-    "symfony/finder": "^3.2"
-  },
-  "autoload": {
-    "psr-4": {
-      "SilverStripe\\BehatExtension\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
-    }
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "3.x-dev"
-    }
-  },
-  "scripts": {
-    "lint": "phpcs --standard=PSR2 -n src/ tests/php/"
-  },
-  "prefer-stable": true,
-  "minimum-stability": "dev"
+    "autoload": {
+        "psr-4": {
+            "SilverStripe\\BehatExtension\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
+        }
+    },
+    "scripts": {
+        "lint": "phpcs --standard=PSR2 -n src/ tests/php/"
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
 }