Revert "Change to get Django 1.5 to work."
Revert "Change to get Django 1.5 to work."

This reverts commit 92b9b557eef77f7ea4c05c74c1c229a2b508e640.
It didn't resolve all the problems, and I'm out of time.

esplinr/foodcheck,esplinr/foodcheck,esplinr/foodcheck,esplinr/foodcheck