Moved dependency apt stuff from travis-deps and into travis.yml