Merge pull request #39 from cameronjacoby/master

add tests for user model