Merge from the two computers' .vimrc files.