Removed registration
Merge branch 'django1.7'

Merge settings that work with Django 1.7