diff --git a/composer.json b/composer.json
index 7440410d5..22e988ac8 100644
--- a/composer.json
+++ b/composer.json
@@ -25,11 +25,12 @@
         "tobscure/json-api": "^0.1.1",
         "oyejorge/less.php": "~1.5",
         "intervention/image": "^2.3.0",
-        "s9e/text-formatter": "dev-release/php5.3@dev",
+        "s9e/text-formatter": "^0.1.0",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.1",
         "nikic/fast-route": "^0.6",
-        "dflydev/fig-cookies": "^1.0"
+        "dflydev/fig-cookies": "^1.0",
+        "symfony/yaml": "^2.7"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "2.*",
diff --git a/composer.lock b/composer.lock
index 254913451..bb43b0637 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "03d96e5a3431fdf12d1f581724dc9e52",
+    "hash": "9b1418962fa1c90ff76716ca0356562b",
     "packages": [
         {
             "name": "danielstjules/stringy",
@@ -1207,16 +1207,16 @@
         },
         {
             "name": "s9e/text-formatter",
-            "version": "dev-release/php5.3",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/TextFormatter.git",
-                "reference": "737d99ff24fd37558703639103e42387d67f5a18"
+                "reference": "ec60dea24268512c040016bbd54ff01f0d1c0443"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/737d99ff24fd37558703639103e42387d67f5a18",
-                "reference": "737d99ff24fd37558703639103e42387d67f5a18",
+                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/ec60dea24268512c040016bbd54ff01f0d1c0443",
+                "reference": "ec60dea24268512c040016bbd54ff01f0d1c0443",
                 "shasum": ""
             },
             "require": {
@@ -1262,7 +1262,7 @@
                 "parser",
                 "shortcodes"
             ],
-            "time": "2015-08-11 18:41:09"
+            "time": "2015-08-12 12:44:18"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -1480,6 +1480,55 @@
             "homepage": "https://symfony.com",
             "time": "2015-07-09 16:07:40"
         },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff",
+                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-07-28 14:07:07"
+        },
         {
             "name": "tobscure/json-api",
             "version": "v0.1.1",
@@ -2329,62 +2378,11 @@
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
             "time": "2015-07-01 11:25:50"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff",
-                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-07-28 14:07:07"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "s9e/text-formatter": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {