diff --git a/Gemfile b/Gemfile
index f3c22f909..b018c1dd9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ gem "memcache-client", :require => "memcache"
 gem "imagesize", :require => "image_size"
 gem "delayed_job"
 gem "super_exception_notifier"
-gem "haml"
 gem "simple_form"
 gem "mechanize"
 gem "nokogiri"
@@ -28,7 +27,7 @@ gem "meta_search", :git => "git://github.com/ernie/meta_search.git"
 gem "silent-postgres"
 gem "whenever", :require => false
 gem "sanitize", :git => "git://github.com/rgrove/sanitize.git"
-gem 'rmagick'
+gem 'rmagick', :require => "RMagick"
 
 group :development do
   gem 'pry'
diff --git a/Gemfile.lock b/Gemfile.lock
index 15437be37..965371f14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,19 +54,18 @@ GEM
     activesupport (3.1.0)
       multi_json (~> 1.0)
     arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    chronic (0.6.3)
-    coderay (0.9.8)
+    chronic (0.6.4)
+    coderay (1.0.0)
     daemons (1.1.4)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
       daemons
     erubis (2.7.0)
-    execjs (1.2.4)
+    execjs (1.2.8)
       multi_json (~> 1.0)
     factory_girl (2.1.0)
-    haml (3.1.2)
     hike (1.2.1)
     i18n (0.6.0)
     imagesize (0.1.1)
@@ -82,7 +81,7 @@ GEM
       webrobots (>= 0.0.9, ~> 0.0)
     memcache-client (1.8.5)
     metaclass (0.0.1)
-    method_source (0.6.0)
+    method_source (0.6.5)
       ruby_parser (>= 2.0.5)
     mime-types (1.16)
     mocha (0.10.0)
@@ -95,12 +94,12 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.2)
-    pry (0.9.3)
+    pry (0.9.6)
       coderay (>= 0.9.8)
-      method_source (>= 0.6.0)
+      method_source (>= 0.6.5)
       ruby_parser (>= 2.0.5)
-      slop (~> 1.9.0)
-    rack (1.3.2)
+      slop (~> 2.1.0)
+    rack (1.3.3)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -127,18 +126,19 @@ GEM
     rake (0.9.2)
     rdoc (3.9.4)
     rmagick (2.13.1)
-    ruby_parser (2.2.0)
+    ruby_parser (2.3.0)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.6)
     shoulda (2.11.3)
     silent-postgres (0.1.1)
-    simple_form (1.4.2)
+    simple_form (1.5.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
-    slop (1.9.1)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    slop (2.1.0)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -173,7 +173,6 @@ DEPENDENCIES
   delayed_job
   factory_girl
   ffaker!
-  haml
   imagesize
   mechanize
   memcache-client