Revert "Revert "minor update""

This reverts commit 85adfea236ef73eaa0ba80f12407e2e61c2997fd.
Revert "integrated django-wiki"

This reverts commit 8a065e935f8d3538127a382e38768595cffca841.