Update from upstream master

- Fixes [problem with highlighting](https://github.com/evidens/vim-twig/issues/13)