Added vim
Merge branch 'develop' into release-1.0
Merge remote-tracking branch 'origin/release-1.0' into release-1.0