Travis build tweaks & cleanups