Some more vimrc setting changes.