diff --git a/Gemfile b/Gemfile
index 65dc3d3..3a46fcc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,17 +2,19 @@
 #
 #      RAILS
 #
-gem 'rails', '4.0.0'
+gem 'rails', '4.2.0'
 
 # additional gems for rails 4
-gem 'railties', '= 4.0.0'
+gem 'railties', '= 4.2.0'
+gem 'responders', '~> 2.0'   # allows use of respond_with and respond_to in controllers
+
 # add these gems to help with the transition:
 gem 'protected_attributes'
 gem 'rails-observers'
 gem 'actionpack-page_caching'
 gem 'actionpack-action_caching'
 
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier' #, '>= 1.3.0'
 
 # Gems used only for assets and not required in production environments by default.
 #group :assets do
@@ -62,7 +64,7 @@
 #
 #    DATABASE/SERVER
 #
-gem 'mysql2', '~> 0.3.10'
+gem 'mysql2', '~> 0.3.18'
 # Use unicorn as the app server
 # gem 'unicorn'
 #cancan for usergroups
@@ -73,7 +75,7 @@
 #
 gem 'jquery-rails'
 gem 'tinymce-rails'
-gem 'friendly_id', '~> 5.0.1'
+gem 'friendly_id' #, '~> 5.0.1'
 gem 'contact_us'
 gem 'recaptcha'
 gem 'turbolinks'
diff --git a/app/models/question.rb b/app/models/question.rb
index be97f38..2a8d087 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -29,8 +29,8 @@
     end
 
     amoeba do
-        include_field :options
-        include_field :suggested_answers
+        include_association :options
+        include_association :suggested_answers
         clone [:themes]
     end
 
diff --git a/app/models/section.rb b/app/models/section.rb
index c4ed815..d5b59c4 100644
--- a/app/models/section.rb
+++ b/app/models/section.rb
@@ -17,7 +17,7 @@
   end
 
   amoeba do
-    include_field :questions
+    include_association :questions
   end
 
 end
diff --git a/app/models/version.rb b/app/models/version.rb
index 52812ee..94e87ff 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -24,8 +24,8 @@
   end
   
   amoeba do
-    include_field :sections
-    include_field :questions
+    include_association :sections
+    include_association :questions
     set :published => 'false'
     prepend :title => "Copy of " 
   end
diff --git a/config/application.rb b/config/application.rb
index 4c07de0..5a688aa 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -84,8 +84,5 @@
     WickedPdf.config = {
 	    :exe_path => '/usr/local/bin/wkhtmltopdf'
 	  }
-    
-    # TODO: Remove this when we migrate to Rails 4.1+
-    config.secret_key_base = YAML.load(File.open("#{Rails.root}/config/secrets.yml"))[Rails.env]['secret_key_base']
   end
 end
diff --git a/config/environment/test.rb b/config/environment/test.rb
index 053f5b6..e9409ee 100644
--- a/config/environment/test.rb
+++ b/config/environment/test.rb
@@ -36,4 +36,6 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+  
+  config.active_support.test_order = :sorted
 end
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 7a06a89..90baf61 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid
\ No newline at end of file
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 4aaaa49..241dcbf 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -14,5 +14,8 @@
 	# set fallback locale
     config.i18n.fallbacks = true    
     
+    
+puts "LOADED LOCALES: #{config.i18n.available_locales}"
+    
   end
 end