Rework .travis.yml as the inclusions didn't work as expected