Convert to django 1.5 custom models
Linter disable
Merge pull request #72 from pydanny/django-1.5-custom-user-models

Convert to django 1.5 custom models
Merge remote-tracking branch 'upstream/master'