Make code compatible with Django 1.5.4.)
Merge pull request #2 from ddsc/byrman_django154

Make code compatible with Django 1.5.4.