add user-activity association, 

cleaned up rspec test so that doesn't wipe out all users, add activities spec