more git options, softer vim settings