Update data model to aggregates (user, bookmark).
Merge branch 'master' of github.com:alunduil/margarine