diff --git a/.gitattributes b/.gitattributes
index 7ae0617..c47225a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,15 @@
-.editorconfig    export-ignore
-.gitattributes   export-ignore
-.github/         export-ignore
-.gitignore       export-ignore
-.php_cs          export-ignore
-.scrutinizer.yml export-ignore
-.styleci.yml     export-ignore
-.travis.yml      export-ignore
-phpspec.yml.ci   export-ignore
-phpspec.yml.dist export-ignore
-phpunit.xml.dist export-ignore
-spec/            export-ignore
-tests/           export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+/.github/         export-ignore
+.gitignore        export-ignore
+/.php_cs          export-ignore
+/.scrutinizer.yml export-ignore
+/.styleci.yml     export-ignore
+/.travis.yml      export-ignore
+/behat.yml.dist   export-ignore
+/features/        export-ignore
+/phpspec.ci.yml   export-ignore
+/phpspec.yml.dist export-ignore
+/phpunit.xml.dist export-ignore
+/spec/            export-ignore
+/tests/           export-ignore
diff --git a/.gitignore b/.gitignore
index da734f1..16b4a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-.puli/
-build/
-vendor/
-composer.lock
-phpspec.yml
-phpunit.xml
+/behat.yml
+/build/
+/composer.lock
+/phpspec.yml
+/phpunit.xml
+/vendor/
diff --git a/.styleci.yml b/.styleci.yml
index 3417c41..5328b61 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -9,3 +9,6 @@ finder:
 
 enabled:
     - short_array_syntax
+
+disabled:
+    - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
diff --git a/.travis.yml b/.travis.yml
index 7a4a218..9bbb449 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
+    - if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
     - travis_retry composer self-update
 
 install:
@@ -37,5 +38,5 @@ script:
     - $TEST_COMMAND
 
 after_success:
-    - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-    - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+    - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+    - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90aaca..ce2c410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,14 @@
 # Change Log
 
+
 ## 1.3.1 - 2016-07-15
 
 ### Fixed
 
 - FullHttpMessageFormatter will not read from streams that you cannot rewind (non-seekable)
 - FullHttpMessageFormatter will not read from the stream if $maxBodyLength is zero
-- FullHttpMessageFormatter rewinds streams after they are read.
+- FullHttpMessageFormatter rewinds streams after they are read
+
 
 ## 1.3.0 - 2016-07-14
 
@@ -15,7 +17,7 @@
 - FullHttpMessageFormatter to include headers and body in the formatted message
 
 ### Fixed
- 
+
 - #41: Response builder broke header value
 
 
diff --git a/composer.json b/composer.json
index a0da5dd..0efd08a 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
     },
     "scripts": {
         "test": "vendor/bin/phpspec run",
-        "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
+        "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
     },
     "extra": {
         "branch-alias": {
diff --git a/phpspec.yml.ci b/phpspec.ci.yml
similarity index 100%
rename from phpspec.yml.ci
rename to phpspec.ci.yml