Merge branch 'master' of github.com:Pylons/pyramid
typos
typo
Reduce duplicated content in wiki2 tutorial
typo
sentence too long; also fix grammar, and add markup
no need to display the entire path
fix up sphinx config:
- make sure the versioning in title, uid is done automatically
- automatically generate copyright years
- excluded additional .js files that were stopping epub from generating
  correctly
- also adjust the remake script to use env not env27
remove info that should be obvious to the reader
fix import typo in docs
I have tested this on Python 3, and it works without modification
grammar
Clarify "TL".  Fixes #777
redundant statement: the links preceeding the statement target the info referred to
typos
the sample apps do not run on Py3k
take advantage of the -c option of Python
Merge branch 'master' of github.com:Pylons/pyramid
Make predicate mismatches not hide other possible valid views.

This is mostly an issue for REST style views that use request_method
predicates and are registered for context interfaces.

See Issue #409
Change log note.