Rework travis.yml back to a build matrix