vimrc cleanup and additions