Merge pull request #394 from mleinart/django15

Django 1.5 compatibility updates