Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -19,12 +19,12 @@ php:
   - 5.6
   - 7.0
   - hhvm
-  - hhvm-nightly
+  - nightly
 
 matrix:
   fast_finish: true
   allow_failures:
-    - php: hhvm-nightly
+    - php: nightly
 
 before_script:
     - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini

README.md

@@ -18,6 +18,13 @@ Installation / Usage
     $ curl -sS https://getcomposer.org/installer | php
     ```
     
+    > **Note:** If the above fails for some reason, you can download the installer
+    > with `php` instead:
+
+    ```sh
+    php -r "readfile('https://getcomposer.org/installer');" | php
+    ```
+
 2. Create a composer.json defining your dependencies. Note that this example is
 a short version for applications that are not meant to be published as packages
 themselves. To create libraries/packages please read the