diff --git a/.gitattributes b/.gitattributes
index 5dd7941..c47225a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,15 @@
-spec/            export-ignore
-tests/           export-ignore
-.editorconfig    export-ignore
-.gitattributes   export-ignore
-.gitignore       export-ignore
-.php_cs          export-ignore
-.scrutinizer.yml export-ignore
-.styleci.yml     export-ignore
-.travis.yml      export-ignore
-CONTRIBUTING     export-ignore
-phpspec.yml.ci   export-ignore
-phpspec.yml.dist export-ignore
-phpunit.xml.dist 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/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..fb288d9
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# Contributing
+
+Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..d4ecf20
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,27 @@
+| Q            | A
+| ------------ | ---
+| Bug?         | no|yes
+| New Feature? | no|yes
+| Version      | Specific version or SHA of a commit
+
+
+#### Actual Behavior
+
+What is the actual behavior?
+
+
+#### Expected Behavior
+
+What is the behavior you expect?
+
+
+#### Steps to Reproduce
+
+What are the steps to reproduce this bug? Please add code examples,
+screenshots or links to GitHub repositories that reproduce the problem.
+
+
+#### Possible Solutions
+
+If you have already ideas how to solve the issue, add them here.
+(remove this section if not needed)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..323987b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,43 @@
+| Q               | A
+| --------------- | ---
+| Bug fix?        | no|yes
+| New feature?    | no|yes
+| BC breaks?      | no|yes
+| Deprecations?   | no|yes
+| Related tickets | fixes #X, partially #Y, mentioned in #Z
+| Documentation   | if this is a new feature, link to pull request in https://github.com/php-http/documentation that adds relevant documentation
+| License         | MIT
+
+
+#### What's in this PR?
+
+Explain what the changes in this PR do.
+
+
+#### Why?
+
+Which problem does the PR fix? (remove this section if you linked an issue above)
+
+
+#### Example Usage
+
+``` php
+// If you added new features, show examples of how to use them here
+// (remove this section if not a new feature)
+
+$foo = new Foo();
+
+// Now we can do
+$foo->doSomething();
+```
+
+
+#### Checklist
+
+- [ ] Updated CHANGELOG.md to describe BC breaks / deprecations | new feature | bugfix
+- [ ] Documentation pull request created (if not simply a bugfix)
+
+
+#### To Do
+
+- [ ] If the PR is not complete but you want to discuss the approach, list what remains to be done here
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 296cab4..5328b61 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -5,6 +5,10 @@ finder:
         - "spec"
     path:
         - "src"
+        - "tests"
 
 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 902be95..260c3a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 cache:
     directories:
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 php:
     - 5.5
@@ -29,10 +29,10 @@ matrix:
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
-    - travis_retry composer self-update
+    - if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
 
 install:
-    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
 
 before_script:
     - vendor/bin/http_test_server > /dev/null 2>&1 &
@@ -40,6 +40,6 @@ before_script:
 script:
     - $TEST_COMMAND
 
-after_script:
-    - 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
+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
diff --git a/CONTRIBUTING b/CONTRIBUTING
deleted file mode 100644
index 841914a..0000000
--- a/CONTRIBUTING
+++ /dev/null
@@ -1 +0,0 @@
-Please see http://docs.php-http.org/en/latest/development/contributing.html
diff --git a/composer.json b/composer.json
index 82b413a..feff4b5 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,5 @@
         "branch-alias": {
             "dev-master": "0.3-dev"
         }
-    },
-    "prefer-stable": true,
-    "minimum-stability": "beta"
+    }
 }
diff --git a/tests/BrowserHttpAdapterTest.php b/tests/BrowserHttpAdapterTest.php
index 8dd3013..5dc86ec 100644
--- a/tests/BrowserHttpAdapterTest.php
+++ b/tests/BrowserHttpAdapterTest.php
@@ -3,7 +3,6 @@
 namespace Http\Adapter\Buzz\Tests;
 
 use Buzz\Browser;
-use Buzz\Client\FileGetContents;
 
 class BrowserHttpAdapterTest extends HttpAdapterTest
 {
diff --git a/tests/CurlHttpAdapterTest.php b/tests/CurlHttpAdapterTest.php
index e437fd6..ed64062 100644
--- a/tests/CurlHttpAdapterTest.php
+++ b/tests/CurlHttpAdapterTest.php
@@ -3,7 +3,6 @@
 namespace Http\Adapter\Buzz\Tests;
 
 use Buzz\Client\Curl;
-use Http\Adapter\Buzz\Client;
 use Buzz\Message\RequestInterface as BuzzRequestInterface;
 
 class CurlHttpAdapterTest extends HttpAdapterTest
diff --git a/tests/DefaultHttpAdapterTest.php b/tests/DefaultHttpAdapterTest.php
index 2ef75e1..69bee15 100644
--- a/tests/DefaultHttpAdapterTest.php
+++ b/tests/DefaultHttpAdapterTest.php
@@ -10,6 +10,6 @@ class DefaultHttpAdapterTest extends HttpAdapterTest
     protected function createBuzzClient()
     {
         // returning null here should cause the adapter to create a default client for us
-        return null;
+        return;
     }
 }