Added  WaterJetPack static data.
Updated categories seed file format
modified:   db/seeds.rb
Added fly board static data

modified:   db/seeds.rb
Merge branch 'master' into jets
Merge branch 'eventbrite' of https://github.com/thomasstephane/randompractice into jets
added validation for phone numbers with extensions
added rake task to save alltrails csv data to db
added a raketask to save everytrail csv file to database
Removed yelp gem, used Mechanize instead.
Craaaaazy changes to be made.
modified:   lib/tasks/yelp.rake
modified:   Gemfile
modified:   Gemfile.lock

Changed presnces true
modified:   app/models/activity.rb
modified:   app/models/category.rb

Removed old colum, changed extern id typ to string
new file:   db/migrate/20130614072349_remove_columns.rb

Adapted the model accordingly
modified:   spec/models/activities_spec.rb

Corrected seed file to match new format
modified:   db/seeds.rb
modified:   spec/factories/factories.rb
Merge branch 'jets'
Updated seed file to update the categories and manual inputs smartly.
modified:   db/seeds.rb

Added fprinter gem to make the seed tests pretty
modified:   Gemfile
Scraper for seatgeek is on!

Updated test accordingly.
modified:   app/models/activity.rb
modified:   lib/tasks/scraper.rake
new file:   lib/tasks/seatgeek.rake
modified:   lib/tasks/yelp.rake
modified:   spec/models/activities_spec.rb
commented out eventbrite rake
fixed merge 'conflict'