diff --git a/.travis.yml b/.travis.yml
index c52455ba..bb77e858 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.1
 branches:
   only:
     - master
@@ -15,6 +15,5 @@ before_script:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - RAILS_ENV=test bundle exec rake db:migrate --trace
-  - bundle exec rake db:test:prepare
 script:
-  - bundle exec rake spec
+  - bundle exec rspec --color --format documentation
diff --git a/app/models/person.rb b/app/models/person.rb
index 4383e71f..f7a1fd04 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -6,7 +6,7 @@ class Person < ActiveRecord::Base
 
   belongs_to :user, :inverse_of => :person
   has_many :event_people, :dependent => :destroy
-  has_many :events, :through => :event_people, :uniq => true
+  has_many :events, -> { uniq }, :through => :event_people
   has_many :registrations, :dependent => :destroy
   has_many :votes, :dependent => :destroy
   has_many :voted_events, :through => :votes, :source => :events
diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb
index 1366fb65..5438da2b 100644
--- a/spec/factories/conferences.rb
+++ b/spec/factories/conferences.rb
@@ -2,12 +2,12 @@
 
 FactoryGirl.define do
   factory :conference do
-	title "The dog and pony show"
-	short_title "dps14"
-	social_tag "dps14"
-	timezone "Amsterdam"
-	contact_email "admin@example.com"
-	start_date Date.today
-	end_date Date.tomorrow
+    title "The dog and pony show"
+    short_title "dps14"
+    social_tag "dps14"
+    timezone "Amsterdam"
+    contact_email "admin@example.com"
+    start_date Date.today
+    end_date Date.tomorrow
   end
 end
diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb
index 88d91e96..5722b4a9 100644
--- a/spec/models/conference_spec.rb
+++ b/spec/models/conference_spec.rb
@@ -1,60 +1,72 @@
 require 'spec_helper'
 
 describe Conference do
-  before do
-    @conference = create(:conference)
-  end
-  
+
+  let(:subject) { create(:conference) }
 
   describe "#registration_open?" do
-  	context "closed registration" do
-  	  it "#registration_open? is false" do
-  	    expect(@conference.registration_open?).to be false
-      end
-  	end
 
-  	context "open registration" do
-  	  before do
-    	@conference.registration_start_date = Date.today - 1
-    	@conference.registration_end_date = Date.today + 7
-  	  end
-  	  it "#registration_open? is true" do
-  		expect(@conference.registration_open?).to be true
-  	  end
-  	end
+    context "closed registration" do
+
+      it "#registration_open? is false" do
+        expect(subject.registration_open?).to be false
+      end
+
+    end
+
+    context "open registration" do
+
+      before do
+        subject.registration_start_date = Date.today - 1
+        subject.registration_end_date = Date.today + 7
+      end
+
+      it "#registration_open? is true" do
+        expect(subject.registration_open?).to be true
+      end
+
+    end
+
   end
 
   describe "#cfp_open?" do
-  	context "closed cfp" do
-  	  it "#cfp_open? is false" do
-  	    expect(@conference.cfp_open?).to be false
-      end
-  	end
 
-  	context "open cfp" do
-  	  before do
-  	  	@cfp = create(:call_for_papers)
-  	  	@conference.call_for_papers = @cfp
-  	  end
-  	  it "#registration_open? is true" do
-  		expect(@conference.cfp_open?).to be true
-  	  end
-  	end
+    context "closed cfp" do
+
+      it "#cfp_open? is false" do
+        expect(subject.cfp_open?).to be false
+      end
+
+    end
+
+    context "open cfp" do
+
+      before do
+        subject.call_for_papers = create(:call_for_papers)
+      end
+
+      it "#registration_open? is true" do
+        expect(subject.cfp_open?).to be true
+      end
+
+    end
+
   end
 
   describe "#user_registered?" do
-  	before do
-  		@user = create(:user)
-  	end
-  	context "user not registered" do
-  	  it "#user_registered? is false" do
-  	    expect(@conference.user_registered? @user).to be false
-      end
-  	end
 
-  	context "user registered" do
-  	  pending "isn't tested yet"
-  	end
+    let(:user) { create(:user) }
+
+    context "user not registered" do
+      it "#user_registered? is false" do
+        expect(subject.user_registered? user).to be false
+      end
+    end
+
+    context "user registered" do
+      pending "isn't tested yet"
+    end
+
   end
  
 end