Updating composer.lock and rearranging .travis.yml