More changes to the vimrc