Merge branch 'revert-2943' of git://github.com/Slamdunk/zf2 into hotfix/2961

Reverts zendframework#2943 (hotfix so composer will work with the repo)

Author: weierophinney

.travis.yml

@@ -7,7 +7,6 @@ php:
 
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- - composer self-update
  - composer install --dev
  - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar