Updated travisci to try and reduce the number of build jobs caused by the matrix