More vimrc improvements