Register custom lookup properly in Django 1.7
Merge branch 'django-17-compat'