added two tests to user_spec (model)
Merge branch 'master' into user-tests

just updating, no changes
minor updates to user model spec and request spec
fixed conflicts