Reduce the risk of circular imports.
Provide a solution to prevent monkey-patching the settings.

This is necessary to work around extreme cases of circular imports.
We really need to reverse URLs at import time and this isn't always
possible.
Small documentation improvements.
Fix regression from last week-end's massive renaming.