Initial changes for django-users2 integration and django 1.7