edited user & item models, tests, db; I will fix 3 failing tests in the morning
Merge branch 'dev' of https://github.com/mlfryman/dibster into dev