Updated models to work with custom user model since django 1.5