Merge branch 'vim' into feat/indent-wrap-lines