Merge branch 'vim-disable-auto-save-after-notype-experiment'