diff --git a/Gemfile b/Gemfile
index dd17021..eb17b51 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.2.3' 
+ruby '2.2.3'
 # Application gems
 gem 'rails', '4.2.5' #previously 4.0.0
 gem 'jquery-rails'
@@ -7,7 +7,7 @@ gem 'devise'
 gem 'simple_form', '~> 3.0.0.rc'
 gem "paperclip", "~> 4.3" #previously 3.0"
 gem "paperclip-dropbox", ">=1.1.7"
-gem 'aws-sdk' #'~> 1.5.7'
+gem "aws-sdk", "< 2.0" #prev '~> 1.5.7' used for resolving conflict w/paperclip
 gem "masonry-rails", '~> 0.2.0'
 gem 'faker', "~> 1.2.0"
 gem 'will_paginate', '~> 3.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 42fc4a8..f0e0b99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,12 +38,11 @@ GEM
       tzinfo (~> 1.1)
     acts_as_follower (0.2.1)
     arel (6.0.3)
-    aws-sdk (2.2.10)
-      aws-sdk-resources (= 2.2.10)
-    aws-sdk-core (2.2.10)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.2.10)
-      aws-sdk-core (= 2.2.10)
+    aws-sdk (1.5.8)
+      httparty (~> 0.7)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     bcrypt (3.1.10)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -87,10 +86,12 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hike (1.2.3)
+    httparty (0.13.7)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     i18n (0.7.0)
     jbuilder (1.2.0)
       activesupport (>= 3.0.0)
-    jmespath (1.1.3)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -110,6 +111,7 @@ GEM
     mini_portile2 (2.0.0)
     minitest (5.8.3)
     multi_json (1.11.2)
+    multi_xml (0.5.5)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
@@ -195,6 +197,7 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    uuidtools (2.1.5)
     warden (1.2.4)
       rack (>= 1.0)
     will_paginate (3.0.7)
@@ -204,7 +207,7 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_follower
-  aws-sdk
+  aws-sdk (< 2.0)
   better_errors
   binding_of_caller
   bootstrap-sass (~> 3.0.3.0)