try to clarify the docs to avoid "if '__main__'" confusion
update old ptweens output
Add HTML escaping to views.py

At least it's less obviously dangerous this way.
Merge pull request #1168 from jthemphill/patch-1

Add HTML escaping to views.py in the wiki2 tutorial
Merge branch '1.5-branch' of github.com:Pylons/pyramid into 1.5-branch
Merge branch 'master' into 1.5-branch
Fix JSONP syntax error
Merge branch 'jsonp-syntax' of github.com:wichert/pyramid into wichert-jsonp-syntax
add url to issue
Merge branch 'wichert-jsonp-syntax'