Use get_user_model for custom user model support
Merge branch 'master' into 1.5
better 1.5 custom user model support, with backwards compatibility in mind
pep8