More tweaks to vimrc.