Updates to handle custom user model change from Django 1.5
Updated to be straight import for readability
Added custom user model and modified test run to use it when Django >= 1.5
Merge pull request #7 from supercodepoet/master

Another option for updating the code for Django 1.5 custom user model