Attempt at backporting composer.json and .travis.yml changes from master