Updating to work with the development branch of Django. This
removes the need for the patch.
Forgot to update the docs.
Small docco changes.