Some changes to the older parts of my vimrc