use composer.json
Update .travis.yml
Merging to 2.0 from: composer_s3