Add vim-salt and vim-jinja
Merge branch 'master' into osx