diff --git a/Gemfile b/Gemfile
index 0dc53a8..3fa3c6b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,7 @@ gem 'will_paginate'
 gem 'bootstrap-will_paginate'
 gem 'cancan'
 gem 'nokogiri'
-gem 'acts-as-taggable-on'
-gem 'rails3-jquery-autocomplete', git: 'https://github.com/francisd/rails3-jquery-autocomplete'
+gem 'acts_as_commentable'
 
 # gem 'jquery-turbolinks'
 
@@ -77,4 +76,5 @@ end
 
 group :production do
   gem 'pg', '0.15.1'
+  gem 'rails_12factor'
 end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 159a0eb..9124433 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,13 +5,6 @@ GIT
     compass-rails (2.0.alpha.0)
       compass (>= 0.12.2, < 0.14)
 
-GIT
-  remote: https://github.com/francisd/rails3-jquery-autocomplete
-  revision: 9884a40f2bb1a8fa3ffab445e6d2c74c3ee99a0d
-  specs:
-    rails3-jquery-autocomplete (1.0.11)
-      rails (>= 3.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -39,8 +32,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    acts-as-taggable-on (2.4.1)
-      rails (>= 3, < 5)
+    acts_as_commentable (4.0.1)
     addressable (2.3.5)
     annotate (2.5.0)
       rake
@@ -188,6 +180,11 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
+    rails_12factor (0.0.2)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.1)
+    rails_stdout_logging (0.0.3)
     railties (4.0.0)
       actionpack (= 4.0.0)
       activesupport (= 4.0.0)
@@ -274,7 +271,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts-as-taggable-on
+  acts_as_commentable
   annotate
   bcrypt-ruby
   bootstrap-will_paginate
@@ -302,7 +299,7 @@ DEPENDENCIES
   pg (= 0.15.1)
   quiet_assets
   rails (= 4.0.0)
-  rails3-jquery-autocomplete!
+  rails_12factor
   rspec-rails
   sass-rails (= 4.0.0.rc2)
   sdoc (= 0.3.20)