Working user tests
added email varification tests
conflicts merged
Merge pull request #33 from BooneTeam/user_rspec_tests

User rspec tests