Improve scoping of variable tags

Fixes textmate/python-django-templates.tmbundle#5.