Support for django >=1.6
Merge pull request #1 from ixc/sjdines-django-update

Support for django 1.6