Switch to custom user model (bug 558514)
Merge pull request #2008 from washort/user-model

Switch to custom user model (bug 558514)