Revert "add is_keynote attribute to event_types"

This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740.

Conflicts:
	app/models/conference.rb

app/views/admin/event_types/_form.html.haml

@@ -13,7 +13,6 @@
       = f.input :length, :input_html => {:size => 3}
       = f.input :minimum_abstract_length, :input_html => {:size => 3}
       = f.input :maximum_abstract_length, :input_html => {:size => 3}
-      = f.input :is_keynote
       = f.input :color, :input_html => { :size => 6, :type => 'color' }
       %p.text-right
-        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
+        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/event_types/index.html.haml

@@ -11,7 +11,6 @@
         %th Title
         %th Length
         %th Abstract Length
-        %th Keynote
         %th Color
         %th Actions
       %tbody
@@ -25,7 +24,6 @@
             %td
               = "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
               Words
-            %td= event_type.is_keynote
             %td
               %span.label{style: "background-color: #{event_type.color};"}
                 = event_type.color

app/views/admin/events/edit.html.haml

@@ -1 +1 @@
-= render 'proposal/form'
+= render 'proposal/form'

app/views/conference/_program.html.haml

@@ -24,19 +24,19 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
+
   %h3.text-center
     Don't miss out!
   %br
   - if @conference.events.highlights.any?
     .row
       .col-md-12
-        - @conference.events.highlights.each_slice(3) do |slice|
+        - @conference.events.highlights.each_slice(2) do |slice|
           .row.row-centered
             - slice.each do |event|
-              .col-md-4.col-centered.col-top.highlights
+              .col-md-6.col-centered.col-top.highlights
                 %p.text-center
                   %b= event.title
-                  by #{event.speakers.first.name}
                 %h5.text-center
                   = simple_format truncate(event.abstract, length: 500, separator: ' ')
                   = link_to "Read More", conference_proposal_path(@conference.short_title, event)