diff --git a/app/controllers/admin/dietchoices_controller.rb b/app/controllers/admin/dietchoices_controller.rb
index c2b04a23..688cd632 100644
--- a/app/controllers/admin/dietchoices_controller.rb
+++ b/app/controllers/admin/dietchoices_controller.rb
@@ -13,4 +13,4 @@ class Admin::DietchoicesController < ApplicationController
       redirect_to(admin_conference_dietary_list_path(:conference_id => @conference.short_title), :alert => "Dietary choices update failed: #{e.message}")
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/admin/difficulty_levels_controller.rb b/app/controllers/admin/difficulty_levels_controller.rb
index 8c9b7701..17335117 100644
--- a/app/controllers/admin/difficulty_levels_controller.rb
+++ b/app/controllers/admin/difficulty_levels_controller.rb
@@ -27,4 +27,4 @@ class Admin::DifficultyLevelsController < ApplicationController
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/admin/questions_controller.rb b/app/controllers/admin/questions_controller.rb
index edaf35d7..d23e8da7 100644
--- a/app/controllers/admin/questions_controller.rb
+++ b/app/controllers/admin/questions_controller.rb
@@ -93,4 +93,4 @@ class Admin::QuestionsController < ApplicationController
     @questions = Question.where(:global => true).all | Question.where(:conference_id => @conference.id)
     @questions_conference = @conference.questions    
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
index 894aea6e..feee3a34 100644
--- a/app/controllers/admin/stats_controller.rb
+++ b/app/controllers/admin/stats_controller.rb
@@ -228,3 +228,4 @@ module Admin
     helper_method :social_event_count
   end
 end
+
diff --git a/app/controllers/admin/supporter_levels_controller.rb b/app/controllers/admin/supporter_levels_controller.rb
index d36dacd9..e835dcf5 100644
--- a/app/controllers/admin/supporter_levels_controller.rb
+++ b/app/controllers/admin/supporter_levels_controller.rb
@@ -13,4 +13,4 @@ class Admin::SupporterLevelsController < ApplicationController
       redirect_to(admin_conference_supporter_levels_path(:conference_id => @conference.short_title), :alert => "Supporter levels update failed: #{e.message}")
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/event_attachments_controller.rb b/app/controllers/event_attachments_controller.rb
index d7b4fa90..a7e63b47 100644
--- a/app/controllers/event_attachments_controller.rb
+++ b/app/controllers/event_attachments_controller.rb
@@ -111,4 +111,4 @@ class EventAttachmentsController < ApplicationController
       format.json { head :no_content }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/proposal_helper.rb b/app/helpers/proposal_helper.rb
index 385a02d2..567b2c1f 100644
--- a/app/helpers/proposal_helper.rb
+++ b/app/helpers/proposal_helper.rb
@@ -10,4 +10,4 @@ module ProposalHelper
     end.join("\n")
     str
   end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb
index bd50b0ff..ab5f4a07 100644
--- a/app/helpers/registration_helper.rb
+++ b/app/helpers/registration_helper.rb
@@ -11,4 +11,4 @@ module RegistrationHelper
     end.join("\n")
     str
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/datatable.rb b/app/models/datatable.rb
index 7f1392da..922e85b6 100644
--- a/app/models/datatable.rb
+++ b/app/models/datatable.rb
@@ -96,4 +96,4 @@ class Datatable
     index = "sSortDir_#{index}"
     params[index] == "desc" ? "desc" : "asc"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/difficulty_level.rb b/app/models/difficulty_level.rb
index 6dd526fe..8334ce69 100644
--- a/app/models/difficulty_level.rb
+++ b/app/models/difficulty_level.rb
@@ -5,4 +5,4 @@ class DifficultyLevel < ActiveRecord::Base
   has_many :events
 
   validates :title, :presence => true
-end
\ No newline at end of file
+end
diff --git a/app/models/event_person.rb b/app/models/event_person.rb
new file mode 100644
index 00000000..935b15cf
--- /dev/null
+++ b/app/models/event_person.rb
@@ -0,0 +1,9 @@
+class EventPerson < ActiveRecord::Base
+  attr_accessible :event, :person, :person_id, :event_role
+  # TODO Do we need these roles?
+  ROLES = [["Speaker","speaker"], ["Submitter","submitter"], ["Moderator","moderator"]]
+
+  belongs_to :event
+  belongs_to :person
+end
+
diff --git a/app/models/question.rb b/app/models/question.rb
index 69ceade7..35d693aa 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -11,4 +11,4 @@ class Question < ActiveRecord::Base
   validates :answers, :presence => true
   
   accepts_nested_attributes_for :answers, :allow_destroy => true
-end
\ No newline at end of file
+end
diff --git a/app/models/role.rb b/app/models/role.rb
index 0fb24257..e6d7cb0a 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,4 +1,4 @@
 class Role < ActiveRecord::Base
   attr_accessible :name
   has_and_belongs_to_many :users
-end
\ No newline at end of file
+end
diff --git a/app/models/room.rb b/app/models/room.rb
index 9d3f00cf..6ce73d1e 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -16,4 +16,4 @@ class Room < ActiveRecord::Base
     self.guid = guid
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/social_event.rb b/app/models/social_event.rb
index db5ac590..ba5ab251 100644
--- a/app/models/social_event.rb
+++ b/app/models/social_event.rb
@@ -3,4 +3,4 @@ class SocialEvent < ActiveRecord::Base
 
   belongs_to :conference
   has_and_belongs_to_many :registrations
-end
\ No newline at end of file
+end
diff --git a/app/models/track.rb b/app/models/track.rb
index 775dae42..94201a73 100644
--- a/app/models/track.rb
+++ b/app/models/track.rb
@@ -15,4 +15,4 @@ class Track < ActiveRecord::Base
     self.guid = guid
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/vday.rb b/app/models/vday.rb
index 2b94be8b..118bf5e2 100644
--- a/app/models/vday.rb
+++ b/app/models/vday.rb
@@ -5,4 +5,4 @@ class Vday < ActiveRecord::Base
 
   has_many :vchoices
   has_many :vpositions, :through => :vchoices, :dependent => :destroy
-end
\ No newline at end of file
+end
diff --git a/app/models/vote.rb b/app/models/vote.rb
index 8954cd5a..81d43d71 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -3,6 +3,7 @@ class Vote < ActiveRecord::Base
 
   belongs_to :user
   belongs_to :event
-
   delegate :name, to: :user
+
 end
+
diff --git a/db/migrate/20121223122307_create_event_people_table.rb b/db/migrate/20121223122307_create_event_people_table.rb
index 5d5ae7cb..9ee30bc6 100644
--- a/db/migrate/20121223122307_create_event_people_table.rb
+++ b/db/migrate/20121223122307_create_event_people_table.rb
@@ -15,4 +15,3 @@ class CreateEventPeopleTable < ActiveRecord::Migration
     drop_table :event_people
   end
 end
-
diff --git a/db/migrate/20121223122842_create_venue_table.rb b/db/migrate/20121223122842_create_venue_table.rb
index 729661ec..0c7c0c57 100644
--- a/db/migrate/20121223122842_create_venue_table.rb
+++ b/db/migrate/20121223122842_create_venue_table.rb
@@ -17,4 +17,3 @@ class CreateVenueTable < ActiveRecord::Migration
   end
 
 end
-
diff --git a/db/migrate/20121223135447_user_roles_table.rb b/db/migrate/20121223135447_user_roles_table.rb
index 91c4dc10..81f715dc 100644
--- a/db/migrate/20121223135447_user_roles_table.rb
+++ b/db/migrate/20121223135447_user_roles_table.rb
@@ -9,4 +9,3 @@ class UserRolesTable < ActiveRecord::Migration
     drop_table :roles_users
   end
 end
-
diff --git a/db/seeds.rb b/db/seeds.rb
index 6b7063dc..5d04058d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -23,4 +23,4 @@ for i in questions_yes_no do
 
   Qanswer.create(:question_id => q.id, :answer_id => answer_no.id)
   Qanswer.create(:question_id => q.id, :answer_id => answer_yes.id)
-end
\ No newline at end of file
+end
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 9e0a8334..e3f64829 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -52,4 +52,4 @@ describe Admin::UsersController do
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/difficulty_levels.rb b/spec/factories/difficulty_levels.rb
index 6cb5f877..af675c86 100644
--- a/spec/factories/difficulty_levels.rb
+++ b/spec/factories/difficulty_levels.rb
@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/social_events.rb b/spec/factories/social_events.rb
index e0b5abd4..2dd59b37 100644
--- a/spec/factories/social_events.rb
+++ b/spec/factories/social_events.rb
@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/supporter_levels.rb b/spec/factories/supporter_levels.rb
index 9edc89de..df6624af 100644
--- a/spec/factories/supporter_levels.rb
+++ b/spec/factories/supporter_levels.rb
@@ -5,4 +5,4 @@ FactoryGirl.define do
     conference
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/tracks.rb b/spec/factories/tracks.rb
index bf2adda7..7f3e1ecf 100644
--- a/spec/factories/tracks.rb
+++ b/spec/factories/tracks.rb
@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/vdays.rb b/spec/factories/vdays.rb
index 8b7462fc..3fc4307f 100644
--- a/spec/factories/vdays.rb
+++ b/spec/factories/vdays.rb
@@ -5,4 +5,4 @@ FactoryGirl.define do
     conference
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/factories/vpositions.rb b/spec/factories/vpositions.rb
index f04b776f..6bfcc769 100644
--- a/spec/factories/vpositions.rb
+++ b/spec/factories/vpositions.rb
@@ -9,4 +9,4 @@ FactoryGirl.define do
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/support/sidebar.rb b/spec/support/sidebar.rb
index 54710ca1..4c730a97 100644
--- a/spec/support/sidebar.rb
+++ b/spec/support/sidebar.rb
@@ -5,4 +5,4 @@ module Sidebar
     render 
     expect(view).to render_template('admin/conference/_sidebar')
   end
-end
\ No newline at end of file
+end
diff --git a/spec/views/admin/rooms/index.html.haml_spec.rb b/spec/views/admin/rooms/index.html.haml_spec.rb
index df03032d..71caf7f4 100644
--- a/spec/views/admin/rooms/index.html.haml_spec.rb
+++ b/spec/views/admin/rooms/index.html.haml_spec.rb
@@ -9,4 +9,4 @@ describe 'admin/rooms/index' do
     expect(rendered).to include('4')
   end
 
-end
\ No newline at end of file
+end