Added spec files and folders, spec_helper
spec/models/activities_spec.rb
spec/models/categories_spec.rb
spec/spec_helper.rb
Added test for activities and categories
Updated matching hash
lib/assets/cat.rb
lib/tasks/scraper.rake
lib/tasks/yelp.rake
Merge branch 'master' into yelp
Fixed Yelp rake task issue, added filter for existing activities.
modified:   lib/tasks/yelp.rake

Fixed typo in new format and added already existing update attribute method
modified:   lib/tasks/scraper.rake