various vimrc updates