diff --git a/composer.json b/composer.json
index 598c6f4ff03..1df27c16d41 100644
--- a/composer.json
+++ b/composer.json
@@ -1,100 +1,98 @@
 {
-  "name": "silverstripe/framework",
-  "type": "silverstripe-module",
-  "description": "The SilverStripe framework",
-  "homepage": "http://silverstripe.org",
-  "license": "BSD-3-Clause",
-  "keywords": ["silverstripe", "framework"],
-  "authors": [
-    {
-      "name": "SilverStripe",
-      "homepage": "http://silverstripe.com"
+    "name": "silverstripe/framework",
+    "type": "silverstripe-module",
+    "description": "The SilverStripe framework",
+    "homepage": "http://silverstripe.org",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "silverstripe",
+        "framework"
+    ],
+    "authors": [
+        {
+            "name": "SilverStripe",
+            "homepage": "http://silverstripe.com"
+        },
+        {
+            "name": "The SilverStripe Community",
+            "homepage": "http://silverstripe.org"
+        }
+    ],
+    "require": {
+        "composer/installers": "~1.0",
+        "embed/embed": "^3.0",
+        "league/flysystem": "~1.0.12",
+        "monolog/monolog": "~1.11",
+        "nikic/php-parser": "^2 || ^3",
+        "paragonie/random_compat": "^2.0",
+        "silverstripe/config": "^1@dev",
+        "silverstripe/assets": "^1@dev",
+        "swiftmailer/swiftmailer": "~5.4",
+        "symfony/cache": "^3.3@dev",
+        "symfony/config": "^3.2",
+        "symfony/translation": "^2.8",
+        "symfony/yaml": "~3.2",
+        "vlucas/phpdotenv": "^2.4",
+        "php": ">=5.6.0",
+        "ext-intl": "*",
+        "ext-mbstring": "*",
+        "ext-xml": "*",
+        "ext-simplexml": "*",
+        "ext-dom": "*",
+        "ext-tokenizer": "*",
+        "ext-ctype": "*",
+        "ext-hash": "*",
+        "ext-session": "*",
+        "psr/container-implementation": "1.0.0",
+        "psr/container": "1.0.0"
     },
-    {
-      "name": "The SilverStripe Community",
-      "homepage": "http://silverstripe.org"
-    }
-  ],
-  "require": {
-    "composer/installers": "~1.0",
-    "embed/embed": "^3.0",
-    "league/flysystem": "~1.0.12",
-    "monolog/monolog": "~1.11",
-    "nikic/php-parser": "^2 || ^3",
-    "paragonie/random_compat": "^2.0",
-    "silverstripe/config": "^1@dev",
-    "silverstripe/assets": "^1@dev",
-    "swiftmailer/swiftmailer": "~5.4",
-    "symfony/cache": "^3.3@dev",
-    "symfony/config": "^3.2",
-    "symfony/translation": "^2.8",
-    "symfony/yaml": "~3.2",
-    "vlucas/phpdotenv": "^2.4",
-
-    "php": ">=5.6.0",
-    "ext-intl": "*",
-    "ext-mbstring": "*",
-    "ext-xml": "*",
-    "ext-simplexml": "*",
-    "ext-dom": "*",
-    "ext-tokenizer": "*",
-    "ext-ctype": "*",
-    "ext-hash": "*",
-    "ext-session": "*",
-    "psr/container-implementation": "1.0.0",
-    "psr/container": "1.0.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^5.7",
-    "silverstripe/versioned": "^1.0@dev",
-    "silverstripe/behat-extension": "^3",
-    "silverstripe/serve": "dev-master",
-    "se/selenium-server-standalone": "2.41.0"
-  },
-  "provide": {
-    "psr/container-implementation": "1.0.0"
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "4.0.x-dev"
-    }
-  },
-  "autoload": {
-    "psr-4": {
-      "SilverStripe\\Control\\": "src/Control/",
-      "SilverStripe\\Control\\Tests\\": "tests/php/Control/",
-      "SilverStripe\\Core\\": "src/Core/",
-      "SilverStripe\\Core\\Tests\\": "tests/php/Core/",
-      "SilverStripe\\Dev\\": "src/Dev/",
-      "SilverStripe\\Dev\\Tests\\": "tests/php/Dev/",
-      "SilverStripe\\Forms\\": "src/Forms/",
-      "SilverStripe\\Forms\\Tests\\": "tests/php/Forms/",
-      "SilverStripe\\i18n\\": "src/i18n/",
-      "SilverStripe\\i18n\\Tests\\": "tests/php/i18n/",
-      "SilverStripe\\Logging\\": "src/Logging/",
-      "SilverStripe\\Logging\\Tests\\": "tests/php/Logging/",
-      "SilverStripe\\ORM\\": "src/ORM/",
-      "SilverStripe\\ORM\\Tests\\": "tests/php/ORM/",
-      "SilverStripe\\Security\\": "src/Security/",
-      "SilverStripe\\Security\\Tests\\": "tests/php/Security/",
-      "SilverStripe\\View\\": "src/View/",
-      "SilverStripe\\View\\Tests\\": "tests/php/View/",
-      "SilverStripe\\Framework\\Tests\\Behaviour\\": "tests/behat/src/"
+    "require-dev": {
+        "phpunit/phpunit": "^5.7",
+        "silverstripe/versioned": "^1.0@dev",
+        "silverstripe/behat-extension": "^3",
+        "silverstripe/serve": "dev-master",
+        "se/selenium-server-standalone": "2.41.0"
     },
-    "files": [
-      "src/includes/constants.php"
-    ]
-  },
-  "include-path": [
-      "src/",
-      "src/includes/",
-      "thirdparty/"
-  ],
-  "scripts": {
-    "lint": "phpcs src/ tests/php",
-    "lint-clean": "phpcbf src/ tests/php",
-    "php-peg": "php thirdparty/php-peg/cli.php src/View/SSTemplateParser.peg > src/View/SSTemplateParser.php"
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
-}
+    "provide": {
+        "psr/container-implementation": "1.0.0"
+    },
+    "extra": [],
+    "autoload": {
+        "psr-4": {
+            "SilverStripe\\Control\\": "src/Control/",
+            "SilverStripe\\Control\\Tests\\": "tests/php/Control/",
+            "SilverStripe\\Core\\": "src/Core/",
+            "SilverStripe\\Core\\Tests\\": "tests/php/Core/",
+            "SilverStripe\\Dev\\": "src/Dev/",
+            "SilverStripe\\Dev\\Tests\\": "tests/php/Dev/",
+            "SilverStripe\\Forms\\": "src/Forms/",
+            "SilverStripe\\Forms\\Tests\\": "tests/php/Forms/",
+            "SilverStripe\\i18n\\": "src/i18n/",
+            "SilverStripe\\i18n\\Tests\\": "tests/php/i18n/",
+            "SilverStripe\\Logging\\": "src/Logging/",
+            "SilverStripe\\Logging\\Tests\\": "tests/php/Logging/",
+            "SilverStripe\\ORM\\": "src/ORM/",
+            "SilverStripe\\ORM\\Tests\\": "tests/php/ORM/",
+            "SilverStripe\\Security\\": "src/Security/",
+            "SilverStripe\\Security\\Tests\\": "tests/php/Security/",
+            "SilverStripe\\View\\": "src/View/",
+            "SilverStripe\\View\\Tests\\": "tests/php/View/",
+            "SilverStripe\\Framework\\Tests\\Behaviour\\": "tests/behat/src/"
+        },
+        "files": [
+            "src/includes/constants.php"
+        ]
+    },
+    "include-path": [
+        "src/",
+        "src/includes/",
+        "thirdparty/"
+    ],
+    "scripts": {
+        "lint": "phpcs src/ tests/php",
+        "lint-clean": "phpcbf src/ tests/php",
+        "php-peg": "php thirdparty/php-peg/cli.php src/View/SSTemplateParser.peg > src/View/SSTemplateParser.php"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}
\ No newline at end of file