Simplified and modernized some files
Merge branch 'master' of https://github.com/mitsuhiko/vim-jinja