More changes to vimrc