Updated to Django 1.6.1.
Merge pull request #395 from opdemand/django-1.6.1

Updated to Django 1.6.1.