Django compatibility: Fixes to account for caching and misc tweaks
Merge pull request #4 from lmorchard/django-1.4.5-upgrade

Django compatibility: Fixes to account for caching and misc tweaks