Further fine tuning of my vimrc.