Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Fixes breaking docs build due to unquoted asterisks in doc string.
Merge pull request #1466 from mgrbyte/fix.rst-requires-escaping-starstarkw

Fixes breaking docs build due to unquoted asterisks in doc string.
Correct url in git remote command.
Merge pull request #1468 from mgrbyte/fix.hackingdotxt-glitch

Correct url in git remote command.
Add support for testing 'pypy3' under Tox / Travis.
Merge pull request #1469 from Pylons/testing-add-pypy3

Add support for testing 'pypy3' under Tox / Travis.
update changelog for #1469
add request processing diagram to docs/narr/router.rst
Shortcut for package name on registry
Documentation added
Include code examples for integration and functional tests in docs #1001
Wrap lines as per convention.
Tweak seealso for the includeme function.
Merge pull request #1467 from mgrbyte/fix.issue1001

Include code examples for integration and functional tests in docs.
Unused import.
79 columns.
Merge branch 'master' of github.com:Pylons/pyramid