Some more changes to vimrc and gitconfig