Merge branch 'master' of github.com:Pylons/pyramid
dont need to use any settings, we include pyramid_jinja2 in main