Removed dependency on the User model

Have replaced direct reference to User with 

```
get_user_model()
```

This allows for custom User models