Highlight twig end tags

This fixes #617.
The rest looks fine so go ahead and merge it then. Thanks!