Merge pull request #1425 from deisner/master

Minor edits to Templating With jinja2