Revert "add is_keynote attribute to event_types"

This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740.

Conflicts:
	app/models/conference.rb

app/models/conference.rb

@@ -45,13 +45,11 @@ class Conference < ActiveRecord::Base
     end
 
     def keynotes
-      where(state: :confirmed).
-      select { |e| e.event_type.is_keynote == true}
+      where(state: :confirmed).select { |e| e.event_type.title == 'Keynote'}
     end
 
     def highlights
-      where(state: :confirmed).where(is_highlight: true).
-      select { |e| e.event_type.is_keynote != true} # No duplication, if event is a keynote
+      where(is_highlight: true)
     end
   end
   has_many :event_users, through: :events

app/models/event_type.rb

@@ -1,6 +1,6 @@
 class EventType < ActiveRecord::Base
   attr_accessible :title, :length, :minimum_abstract_length, :maximum_abstract_length, :color,
-                  :conference_id, :is_keynote
+                  :conference_id
 
   belongs_to :conference