Merge branch 'master' of github.com:Pylons/pyramid
Wee typo fix
Merge pull request #1231 from danjacka/patch-1

Wee typo fix
Merge branch 'master' of github.com:Pylons/pyramid
add scaffolding changes to whatsnew
prep for 1.5a4 release