made some changes without creating a new branch first, commiting them so I can move them to verbose_not_implemented_errors branch
Merge branch 'master' of https://github.com/Cheekio/django, also, make less mistakes in the future