test fixes
 Finish basic User model (including secure passwords)
minor stuff
Merge branch 'modeling-users'
minor stuff