Merge branch 'master' of github.com:Pylons/pyramid
update changelog
fix markup
add example of rendering to the changelog
add install_requires example as well
remove some mako/chameleon renderer docs
change focus from we to you
more chameleon builtin references
add a section mentioning external template bindings
add index for custom template engines
remove chameleon and mako template-specific documentation
whitespace fixes
move templating bindings back into the templating chapter
remove some more mako/chameleon references
update the MyProject example app to use pyramid_chameleon
remove chameleon refs from asset specs
update the code in the wiki and wiki2 tutorials to use pyramid_chameleon
fix some more broken references
update scaffolds to require pyramid_chameleon
apostrophe