Vimrc updates.
merge