Redid everything to work with rails 4
Switched to Rails 4
fixed merge conflicts in event.rb