Various vimrc fixes