Simplify the travis script as it was mainly already in features anyway.