Fix bad diff colors in vim, fix prompt.