Merge pull request #39 from arieldiamond/in_app_invites

In app invites
fixed two of the tests in the activities controller
fixing seed file so users are confirmed
Merge pull request #40 from arieldiamond/user_seeds

fixing seed file so users are confirmed
Merge branch 'master' into in_app_invites
giving up on rspec for now
most of in-app invites working