Removed extra indentation from some examples (:linenos: should be indented with the same indentation as the rest of the code block)
Fixed indentation issues
Merge pull request #1193 from ztane/master

Indentation fixes
Should return the simple_tween here, not the handler.
Merge pull request #1195 from ztane/master

Should return the simple_tween here, not the handler.
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' into 1.5-branch