Merge branch '1.5-branch'
Merge branch 'master' of github.com:Pylons/pyramid
move docs section to a more appropriate place