vim-jinja (https://github.com/mitsuhiko/vim-jinja) uses the filetype htm...

this merge should add support for htmljinja filetypes, which vim-jinja uses