Remove any call to `get_user_model` in the global scope
Merge branch 'custom-user-models' into develop-ledej

Conflicts:
	account/conf.py