Django 1.6 compatibility.
Merge branch 'master' of https://github.com/zorainc/django-datafilters

Conflicts:
	datafilters/views.py