Major VIMRC cleanup