Updated composer_options for the upcoming changes in composer.
Fixed tests.
Merge pull request #372 from pylebecq/composer-alpha7-changes

Updated composer_options for the upcoming changes in composer.