diff --git a/.travis.yml b/.travis.yml
index 307911a1..cbb6feea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.5
 env:
   - DB=postgresql
 bundler_args: --without development
diff --git a/Gemfile b/Gemfile
index f9d97c53..4e4dd480 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.1.0'
+ruby '2.1.5'
 
 gem 'rails', '3.2.16'
 
@@ -51,7 +51,7 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'thin'
-  gem 'debugger'
+  gem 'byebug'
   gem 'letter_opener'
   gem 'quiet_assets'
   gem 'guard'
diff --git a/Gemfile.lock b/Gemfile.lock
index ed0dd7a7..dd26cc0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,10 @@ GEM
     bootstrap-sass (3.0.0.0.rc2)
       sass (~> 3.2)
     builder (3.0.4)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -68,7 +72,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    columnize (0.3.6)
+    columnize (0.9.0)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -85,12 +89,7 @@ GEM
     daemons (1.1.9)
     database_cleaner (1.1.1)
     debug_inspector (0.0.2)
-    debugger (1.6.5)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
     devise (2.2.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -305,6 +304,7 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slop (3.6.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -356,13 +356,13 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass (~> 3.0.0.0.rc)
+  byebug
   capybara
   carrierwave
   coffee-rails (~> 3.2.1)
   compass-rails
   coveralls
   database_cleaner
-  debugger
   devise (= 2.2.4)
   factory_girl_rails
   ffaker