Merge branch 'vim' into feat/var-tabstops