Merge pull request #7 from incuna/user-model-mixins

Convert abstract models to mixins.
Merge remote-tracking branch 'origin/master' into merge-version