Yet more Travis-CI fixes (mostly stolen from flycheck!)