Merge branch 'release/2.0.0' into develop
Updated vimrc template
Bump to 2.1.1
Merge branch 'release/2.1.1'
Merge branch 'master' of github.com:dotphiles/dotvim