Merging in fixes from a stale pull request

Merging from jinja2-htmlcompress/pull/6