Improved Travis build matrix