Merge branch 'master' of github.com:Pylons/pyramid
get rid of note that appears to be explained in the next para
fix the docs build and get rid of stray references to Beaker