merging other vimrc changes