typo
Merge branch 'master' of github.com:Pylons/pyramid
make sure that missing template renderer factories dont cause a startup time error, and instead behave like other renderers which, when missing, cause pyramid to throw a valueerror at rendering time
better description of mako/chameleon bw incompat in changelog, update whatsnew for 1.5