…scriminators, change conflict resolution to deal with deferred discriminators, make predicates take a config argument, get rid of legacy make_predicates function
…()" rather than "__phash__()" and "__text__()"
…; still requires testing of predicates themselves
corrected table name tables->pages in wiki tutorial Design page
Replacement markers of url dispatcher can contain regex with colons.
Include instructions for recursive submodule checkout of Sphinx themes.
Note that we rely on the default settings (failures always send, success sends only on change.).
We need an explanation for why the PyPy tests fail under travis-ci.