Started to add vim
Fixed the setup of the tests
Merge branch 'vim'