add user-activity association, cleaned up rspec test so that doesn't wipe out all users, add activities spec
Merge pull request #9 from gopher-snakes-2013/add-association

add user-activity association,