Merge pull request #1424 from stevepiercy/master

Cherry pick 1.5 branch onto master
Minor edits to Templating With jinja2

 * Fix grammar, order of operations in step 1.

 * Remove Analysis section reference to pyramid.includes in functional
   tests, which is no longer accurate.
Merge pull request #1425 from deisner/master

Minor edits to Templating With jinja2