Cleaning up .travis.yml and composer.json