Patch for Django 1.5 custom User models
Merge remote-tracking branch 'origin/master' into django_15
Merge branch 'master' of git://github.com/pivotal-energy-solutions/django-company-registration into django_15
Merge remote-tracking branch 'origin/master' into django_15
Compatibility for merging to master
Whoops
Fix typo