Merge branch 'vim' into feat/rel-line-numbers