Merging chgs from mcc vimrc.