vimrc update and plugin tidy up