Save other users some time when they migrate to Django 1.7 (or if they start off using Django 1.7)
Merge pull request #29 from dhui/update_docs

Save other users some time when they migrate to Django 1.7