diff --git a/Gemfile b/Gemfile
index 009d088e..bb947132 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,13 +3,8 @@ source 'https://rubygems.org'
 # Core gems
 gem 'rails', '3.2.11'
 
-group :development, :test do  
-  gem 'sqlite3'
-  gem 'guard'
-  gem 'guard-rspec'
-end
 # Database adapters
-gem 'pg', '0.12.2'
+gem 'pg'
 
 # Auth/Cloudfuji gems
 gem 'devise'
@@ -33,18 +28,29 @@ gem 'airbrake'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails'
+  gem 'coffee-rails'
   gem 'bourbon'
-  gem 'execjs'   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'execjs'   
   gem 'eco'
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier'
+end
+
+group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'rack-mini-profiler'
 end
 
-# Test gems, obviously
 group :test do
   gem 'rspec-rails'
   gem 'shoulda-matchers'
-  gem 'factory_girl_rails', '~> 3.0'
-  gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
+  gem 'factory_girl_rails'
 end
+
+group :development, :test do  
+  gem 'sqlite3'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git', :branch => '1.2.rc1'
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index ce2923e8..a7da9f97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,6 +59,10 @@ GEM
       nokogiri (<= 1.5.0)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
+    better_errors (0.3.2)
+      coderay (>= 1.0.0)
+      erubis (>= 2.7.0)
+    binding_of_caller (0.6.8)
     bourbon (1.4.0)
       sass (>= 3.1)
     bourne (1.1.2)
@@ -167,6 +171,8 @@ GEM
     rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-mini-profiler (0.1.23)
+      rack (>= 1.1.3)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
@@ -256,26 +262,29 @@ DEPENDENCIES
   _bushido-faye (= 0.8.2)
   airbrake
   aws-sdk
+  better_errors
+  binding_of_caller
   bourbon
   cloudfuji
   cloudfuji_paperclip
-  coffee-rails (~> 3.2.1)
+  coffee-rails
   devise
   devise_cloudfuji_authenticatable
   eco
   execjs
-  factory_girl_rails (~> 3.0)
+  factory_girl_rails
   guard
   guard-rspec
   jasmine!
   jquery-rails
   kaminari
-  pg (= 0.12.2)
+  pg
+  rack-mini-profiler
   rails (= 3.2.11)
   remotipart
   rspec-rails
-  sass-rails (~> 3.2.3)
+  sass-rails
   shoulda-matchers
   sqlite3
   thin
-  uglifier (>= 1.0.3)
+  uglifier