blah
Merge branch 'bootstrap' of github.com:jbutkowski/unify into bootstrap

* 'bootstrap' of github.com:jbutkowski/unify:
  wip
  added user model