Added test for unicode basic authentication
Python 3 compatible string handling
Switched to bytes
trim commented-out parts of docs/conf.py

proposed here:
https://groups.google.com/forum/?fromgroups=#!topic/pylons-devel/n2-7zvLWK3E
DOC: Update quick_tour.rst: Typo: with -> which
Merge pull request #1106 from westurner/patch-1

DOC: Update quick_tour.rst: Typo: with -> which
Merge branch 'master' of github.com:Pylons/pyramid
Remove the mako templating
Remove requirement from setup.py
Remove mako test specific files

These files now live in the pyramid_mako git repository...
Require the pyramid_mako package

This is mainly for backwards compatibility.
Import mako from the proper location...
Remove last references to mako

We remove the default addition of .mak/.mako files in the configuration
object, and we remove the test to see if it is has been defined as a
renderer.
Removed unnecessary side bar with duplicate content

The side-bar contained a duplication of code that was already in the
main article. Adding a note instead and removing the side-bar provides
the same information without nearly as much duplication.
Merge branch 'master' of github.com:Pylons/pyramid
Remove chameleon as a dependency in setup.py
Remove the Chameleon renderer from renderers.py
update changelog
fix markup
add example of rendering to the changelog