diff --git a/Gemfile b/Gemfile
index f29b4ca..69dac0e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,6 @@ gem 'oauth2', '~> 0.8.0'
 gem 'carrierwave'
 gem 'carrierwave-imageoptimizer'
 gem 'mini_magick'
-gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
 gem 'carmen-rails'
 gem 'nested_form'
 gem 'acts_as_list'
@@ -50,12 +49,20 @@ group :test do
 	gem 'selenium-webdriver'
 	gem 'simplecov', require: false
 	gem 'webmock', require: false
-	gem 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
 end
 
 group :staging, :production do
 	gem 'rails_12factor'
 	gem 'capistrano'
 	gem 'rvm-capistrano'
-	gem 'unicorn' if !(RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i)
+end
+
+platforms 'mswin', 'mingw' do
+	group :test do
+		gem 'wdm', '>= 0.1.0'
+	end
+
+	group :staging, :production do
+		gem 'unicorn'
+	end
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index a7274e5..58b394d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,11 +12,6 @@ GIT
     i18n-active_record (0.0.2)
       i18n (>= 0.5.0)
 
-PATH
-  remote: ../carmen/
-  specs:
-    carmen (1.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -49,7 +44,10 @@ GEM
     addressable (2.3.6)
     arel (4.0.2)
     awesome_print (1.2.0)
+    bcrypt (3.1.7)
     bcrypt (3.1.7-x86-mingw32)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     bcrypt-ruby (3.1.5-x86-mingw32)
       bcrypt (>= 3.1.3)
     better_errors (1.1.0)
@@ -71,6 +69,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carmen (1.0.1)
+      unicode_utils (~> 1.4.0)
     carmen-rails (1.0.1)
       carmen (~> 1.0.0)
       rails
@@ -122,6 +122,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
     ffi (1.9.3-x86-mingw32)
     forgery (0.6.0)
     formatador (0.2.4)
@@ -159,6 +160,7 @@ GEM
     json (1.8.1)
     jwt (0.1.13)
       multi_json (>= 1.5)
+    kgio (2.9.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     listen (2.7.5)
@@ -189,6 +191,8 @@ GEM
     net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     nokogiri (1.6.2.1-x86-mingw32)
       mini_portile (= 0.6.0)
     oauth (0.4.7)
@@ -201,8 +205,13 @@ GEM
     paper_trail (3.0.2)
       activerecord (>= 3.0, < 5.0)
       activesupport (>= 3.0, < 5.0)
+    pg (0.17.1)
     pg (0.17.1-x86-mingw32)
     polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     pry (0.9.12.6-x86-mingw32)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -231,6 +240,7 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    raindrops (0.13.0)
     rake (10.3.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.4)
@@ -302,7 +312,11 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    wdm (0.1.0)
+    unicode_utils (1.4.0)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     webmock (1.18.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -312,6 +326,7 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES
@@ -321,7 +336,6 @@ DEPENDENCIES
   binding_of_caller
   capistrano
   capybara
-  carmen!
   carmen-rails
   carrierwave
   carrierwave-imageoptimizer
@@ -356,5 +370,6 @@ DEPENDENCIES
   simplecov
   sorcery (>= 0.8.1)
   uglifier (>= 1.3.0)
+  unicorn
   wdm (>= 0.1.0)
   webmock