Merge pull request #33 from razamatan/master

jinja.vim subsumes htmljinja.vim