various vimrc updates & fixes