Merge vimrc changes