fix travis
Merge branch 'master' of github.com:dereuromark/setup
composer