Some travis tweaks, too