Major changes to vimrc