fix vim-jinja confilit
fix jinja conflict
Merge branch 'master' of https://github.com/lanticezdd/dotfiles