vimrc cleanup and bundle up