Better build matrix for Travis CI