Add support for Django 1.5 custom User models
Fixed spacing issues
Merge branch 'huxley/develop'