Merge branch 'master' of github.com:Pylons/pyramid
Merge pull request #933 from stevepiercy/master

Generalize Python versions in Windows section
some consistency fixes
Merge pull request #935 from tshepang/consistency

some consistency fixes
remove unused ignore-next-block directive
rm unused glossary entry
Merge pull request #937 from tshepang/rm

rm unused glossary entry
Merge pull request #936 from tshepang/unused

remove unused 'ignore-next-block' directive
remove visual noise

In addition, we also get syntax highlighting... for free.
update Copyright year
Merge pull request #939 from tshepang/licence

update Copyright year
Merge branch 'master' of github.com:Pylons/pyramid
change some slightly awkward wording
create optionality note for traversal chapter, see issue #879
Merge pull request #938 from tshepang/noise

remove visual noise