swap to softtabs
add editor to .gitconfig

mvim -f to wait for the program to exit before we make the commit