diff --git a/Gemfile b/Gemfile
index a35bda0..abb0c96 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,26 +2,37 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.1.3'
 
+# Bundle edge Rails instead:
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+
 gem 'mysql2'
 
 
 
+# Gems used only for assets and not required
+# in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.1.5'
   gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier', '>= 1.0.3'
-  gem "therubyracer"
-
 end
 
 gem 'jquery-rails'
 
-#gem 'capistrano'
-#gem 'rvm-capistrano'
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
 
-gem 'unicorn'
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
 
 group :test do
+  # Pretty printed test output
   gem 'turn', '0.8.2', :require => false
 end
 
@@ -35,6 +46,5 @@ gem 'devise'
 gem 'kaminari'
 gem 'carrierwave'
 gem 'rmagick'
-
-gem 'sqlite3'
-
+gem 'unicorn'
+gem "therubyracer"
diff --git a/Gemfile.lock b/Gemfile.lock
index e962cf5..acb0e56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,12 +35,6 @@ GEM
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    capistrano (2.11.2)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     carrierwave (0.5.8)
       activesupport (~> 3.0)
     coffee-rails (3.1.1)
@@ -60,7 +54,6 @@ GEM
     formtastic (2.0.2)
       rails (~> 3.0)
     haml (3.1.4)
-    highline (1.6.11)
     hike (1.2.1)
     i18n (0.6.0)
     jquery-rails (1.0.19)
@@ -70,7 +63,6 @@ GEM
     kaminari (0.12.4)
       rails (>= 3.0.0)
     kgio (2.7.2)
-    libv8 (3.3.10.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -78,13 +70,6 @@ GEM
     mime-types (1.17.2)
     multi_json (1.0.4)
     mysql2 (0.3.11)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
     rack (1.3.5)
@@ -116,8 +101,6 @@ GEM
     rdoc (3.11)
       json (~> 1.4)
     rmagick (2.13.1)
-    rvm-capistrano (1.2.5)
-      capistrano (>= 2.0.0)
     sass (3.1.11)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
@@ -127,10 +110,7 @@ GEM
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    therubyracer (0.9.10)
-      libv8 (~> 3.3.10)
+      tilt (!= 1.3.0, ~> 1.1)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -155,7 +135,6 @@ PLATFORMS
 DEPENDENCIES
   acts_as_commentable
   acts_as_tree
-  capistrano
   carrierwave
   coffee-rails (~> 3.1.1)
   devise
@@ -166,10 +145,7 @@ DEPENDENCIES
   mysql2
   rails (= 3.1.3)
   rmagick
-  rvm-capistrano
   sass-rails (~> 3.1.5)
-  sqlite3
-  therubyracer
   turn (= 0.8.2)
   uglifier (>= 1.0.3)
   unicorn