More improvements to vimrc