Fixing the User admin NotRegisted exception throwed when using Django 1.5's custom user model feature
Merge pull request #325 from h3/master

Fixing issue #324 for Django 1.5
Fixed several grammar and formatting issues.
Merge pull request #328 from ckirkman/patch-1

Fixed several grammar and formatting issues.
Merge remote-tracking branch 'upstream/master'