some vimrc improvements
bring in other vimrc changes