Fix composer/travis problems (I hope)