diff --git a/app/controllers/api/credits_controller.rb b/app/controllers/api/credits_controller.rb
new file mode 100644
index 000000000..059a833cf
--- /dev/null
+++ b/app/controllers/api/credits_controller.rb
@@ -0,0 +1,2 @@
+class Api::CreditsController < ApplicationController
+end
diff --git a/app/controllers/api/donations_controller.rb b/app/controllers/api/donations_controller.rb
new file mode 100644
index 000000000..2941f546c
--- /dev/null
+++ b/app/controllers/api/donations_controller.rb
@@ -0,0 +1,2 @@
+class Api::DonationsController < ApplicationController
+end
diff --git a/app/controllers/api/pitches_controller.rb b/app/controllers/api/pitches_controller.rb
new file mode 100644
index 000000000..292571930
--- /dev/null
+++ b/app/controllers/api/pitches_controller.rb
@@ -0,0 +1,2 @@
+class Api::PitchesController < ApplicationController
+end
diff --git a/app/controllers/api/stories_controller.rb b/app/controllers/api/stories_controller.rb
new file mode 100644
index 000000000..5d0cfed8f
--- /dev/null
+++ b/app/controllers/api/stories_controller.rb
@@ -0,0 +1,2 @@
+class Api::StoriesController < ApplicationController
+end
diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
new file mode 100644
index 000000000..5f16bd091
--- /dev/null
+++ b/app/controllers/api/users_controller.rb
@@ -0,0 +1,2 @@
+class Api::UsersController < ApplicationController
+end
diff --git a/app/models/news_item.rb b/app/models/news_item.rb
index 2ffa19424..9b212e862 100644
--- a/app/models/news_item.rb
+++ b/app/models/news_item.rb
@@ -38,8 +38,6 @@
 #  current_funding             :decimal(15, 2)
 #
 
-require "url_shortener"
-
 class NewsItem < ActiveRecord::Base
   include HasTopics
   include AASMWithFixes
diff --git a/config/environment.rb b/config/environment.rb
index bbcc1a9ab..e0d7fab51 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -33,10 +33,14 @@
   config.gem "cucumber", :lib => false, :version => "= 0.1.16"
   config.gem "webrat", :lib => false, :version => "= 0.4.4"
   config.gem "money", :version => ">=2.1.3"
-  config.gem "oauth2"
+  config.gem "oauth2", :version => "= 0.4.1"
+  config.gem "faraday", :version => "= 0.6.1"
   config.gem "json"
   config.gem "twitter_oauth"
-
+  config.gem "memcached"
+  config.gem "right_aws"
+  config.gem "url_shortener"
+  
   config.time_zone = 'UTC'
 
   config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
diff --git a/config/facebooker.yml.example b/config/facebooker.yml.example
deleted file mode 100644
index c7a02e9e3..000000000
--- a/config/facebooker.yml.example
+++ /dev/null
@@ -1,62 +0,0 @@
-# The api key, secret key, and canvas page name are required to get started
-# Tunnel configuration is only needed if you are going to use the facebooker:tunnel Rake tasks
-# Your callback url in Facebook should be set to http://public_host:public_port
-# If you're building a Facebook connect site, 
-#    change the value of set_asset_host_to_callback_url to false
-# To develop for the new profile design, add the following key..
-# api: new
-# remove the key or set it to anything else to use the old facebook design.
-# This should only be necessary until the final version of the new profile is released.
-
-development:
-  api_key: xxxxxxxxxx
-  secret_key: xxxxxxxxxx
-  canvas_page_name:
-  callback_url: http://localhost:3000/
-  pretty_errors: true
-  set_asset_host_to_callback_url: false
-  tunnel:
-    public_host_username: 
-    public_host: 
-    public_port: 4007
-    local_port: 3000
-    server_alive_interval: 0
-
-test:
-  api_key: 
-  secret_key: 
-  canvas_page_name: 
-  callback_url:
-  set_asset_host_to_callback_url: false
-  tunnel:
-    public_host_username: 
-    public_host: 
-    public_port: 4007
-    local_port: 3000
-    server_alive_interval: 0
-    
-staging:
-  api_key: xxxxxxxxxx
-  secret_key: xxxxxxxxxx
-  canvas_page_name: 
-  callback_url: http://www.domain.com/
-  set_asset_host_to_callback_url: false   
-  tunnel:
-    public_host_username: 
-    public_host: 
-    public_port: 4007
-    local_port: 3000
-    server_alive_interval: 0
-
-production:
-  api_key: xxxxxxxxxx
-  secret_key: xxxxxxxxxx
-  canvas_page_name: 
-  callback_url: http://domain.com/
-  set_asset_host_to_callback_url: false   
-  tunnel:
-    public_host_username: 
-    public_host: 
-    public_port: 4007
-    local_port: 3000
-    server_alive_interval: 0
diff --git a/config/initializers/lib_references.rb b/config/initializers/lib_references.rb
index 68ef05fd8..e69de29bb 100644
--- a/config/initializers/lib_references.rb
+++ b/config/initializers/lib_references.rb
@@ -1 +0,0 @@
-require 'memcached'
\ No newline at end of file
diff --git a/config/s3.yml.example b/config/s3.yml.example
new file mode 100644
index 000000000..1c132b778
--- /dev/null
+++ b/config/s3.yml.example
@@ -0,0 +1,3 @@
+development:
+    access_key_id: "access_key_id"
+    secret_access_key: "secret_access_key"
\ No newline at end of file