A number of improvements to my vimrc