Use AUTH_USER_MODEL rather than User explicitly
Merge branch 'master' of https://github.com/borwick/django-badger

Conflicts:
	badger/models.py