django 1.7 fixes

the custom user model isn't strictly a 1.7 fix