Some fixes to our Travis config.