Fix matching of endblocks, use `:norm!`

`{% endblock foo %}` is valid for Django, and wasn't matched before.
This also adds a comma after `cache` for b:match_words.