Major vimrc cleanup