diff --git a/Gemfile b/Gemfile
index 79fdaead7..ac132e263 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.10'
 
-gem 'pg'
+gem 'pg' #env ARCHFLAGS="-arch x86_64"
 gem 'counter_culture'
 gem 'after_commit_action'
 gem 'ransack'
@@ -106,9 +106,6 @@ group :development do
   gem 'meta_request'
   gem 'foreman', :require => false
 
-  # Use puma for development
-  gem 'puma', :require => false
-
 end
 
 group :test do
@@ -127,6 +124,7 @@ end
 
 group :heroku, :production do
   gem 'unicorn', :require => false
+  gem 'puma', :require => false
 end
 
 gem 'execjs'
diff --git a/Gemfile.lock b/Gemfile.lock
index 467a7495a..0bf03fea8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,7 +234,6 @@ GEM
       activeresource (>= 2.3.0)
     pg (0.17.1)
     pivotal-tracker (0.5.12)
-      builder
       builder
       crack
       happymapper (>= 0.3.2)
@@ -242,7 +241,6 @@ GEM
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
       rest-client (~> 1.6.0)
-      rest-client (~> 1.6.0)
     polyamorous (1.1.0)
       activerecord (>= 3.0)
     premailer (1.8.2)
@@ -478,3 +476,6 @@ DEPENDENCIES
   webmock
   xmpp4r
   yajl-ruby
+
+BUNDLED WITH
+   1.10.4