Updated to Django 1.6.
Merge pull request #340 from opdemand/django-1.6

Fixed #338 - updated to Django 1.6.