Replace vim by editor
Merge pull request #4600 from lukaselmer/patch-1

Replace vim by editor