Changed code which handles swapped out auth.user model to prevent circular import
Merge pull request #206 from uruz/fix-swappable-user-model

Changed code which handles swapped out auth.user model to prevent circular import