Travis tweaks/cleanup