diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a32d76a4b..522c218c1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -38,7 +38,7 @@ module ApplicationHelper
   end
 
   def jquery_include_tag
-    javascript_include_tag('//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') +
+    "<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js' type='text/javascript'></script>".html_safe +
     content_tag(:script) do
       "!window.jQuery && document.write(unescape(\"#{escape_javascript(include_javascripts(:jquery))}\")); jQuery.ajaxSetup({'cache': false});".html_safe
     end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a9d3301cf..5ecf6bc58 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -54,12 +54,11 @@
 
     / bootstrap/blueprint switch
     - if @aspect == :getting_started || @page == :logged_out
-      = stylesheet_link_tag "bootstrap.min.css"
+      = include_stylesheets :bootstrap
     - else
-      = stylesheet_link_tag "blueprint/screen", :media => 'screen'
-      = stylesheet_link_tag "blueprint/print", :media => 'print'
+      = include_stylesheets :blueprint, :media => 'screen'
 
-    = stylesheet_link_tag "login", :media => 'screen'
+    = include_stylesheets :login, :media => 'screen'
 
     = include_stylesheets :default, :media => 'all'
     - if rtl?
@@ -78,7 +77,7 @@
 
     = csrf_meta_tag
     <!--[if IE]>
-    = javascript_include_tag "/javascripts/ie.js"
+    = include_javascripts :ie
     <![endif]-->
 
     = jquery_include_tag
diff --git a/app/views/shared/_mail_signup_form.erb b/app/views/shared/_mail_signup_form.erb
index 72553af9e..24603af82 100644
--- a/app/views/shared/_mail_signup_form.erb
+++ b/app/views/shared/_mail_signup_form.erb
@@ -1,6 +1,6 @@
 
 <!-- Begin MailChimp Signup Form -->
-<%= javascript_include_tag 'vendor/mailchimp/jquery126.min.js', 'vendor/mailchimp/jquery.validate.js', 'vendor/mailchimp/jquery.form.js' %>
+<%= include_javascripts :mailchimp %>
 <div id="mc_embed_signup">
 <form action="http://joindiaspora.us1.list-manage.com/subscribe/post?u=d759919b94f9cdcf39d204f3f&amp;id=7b5ceb2f8b" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank">
 	
diff --git a/config/assets.yml b/config/assets.yml
index 77b7059ee..46f4da3ce 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -5,7 +5,6 @@ gzip_assets: off
 javascripts:
   jquery:
     - public/javascripts/vendor/jquery-1.7.1.min.js
-
   main:
     - public/javascripts/vendor/underscore.js
     - public/javascripts/vendor/backbone.js
@@ -86,8 +85,15 @@ javascripts:
     - public/javascripts/inbox.js
   profile:
     - public/javascripts/vendor/jquery.autoSuggest.custom.js
-
+  ie:
+    - public/javascripts/ie.js
 stylesheets:
+  bootstrap:
+    - public/stylesheets/bootstrap.min.css
+  blueprint:
+    - public/stylesheets/blueprint/screen.css
+  login:
+    - public/stylesheets/login.css
   default:
     - public/stylesheets/application.css
     - public/stylesheets/ui.css
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6d51c531c..d52461370 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -39,7 +39,9 @@ Diaspora::Application.configure do
 
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  if ENV['ASSET_HOST']
+    config.action_controller.asset_host = ENV['ASSET_HOST']
+  end
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb
index 920032308..f90629be0 100644
--- a/config/initializers/airbrake.rb
+++ b/config/initializers/airbrake.rb
@@ -5,7 +5,6 @@
 if AppConfig[:airbrake_api_key].present?
   require 'airbrake'
   Airbrake.configure do |config|
-    puts AppConfig[:airbrake_api_key]
     config.api_key = AppConfig[:airbrake_api_key]
   end
 end
\ No newline at end of file
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 8b810f9a6..c04fca7d0 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -1,6 +1,23 @@
 namespace :assets do
 	task :precompile do
+    puts "compiling sass..."
     system 'sass --update public/stylesheets/sass:public/stylesheets'
-    system 'bundle exec jammit'
+
+    puts "packaging assets....."
+    Jammit.package!
+
+    Rake::Task['assets:upload_to_s3'].invoke
 	end
+
+  task :upload_to_s3 => [:environment] do
+   s3_configuration = {
+     :bucket_name => AppConfig[:s3_bucket],
+     :access_key_id =>  AppConfig[:s3_key],
+     :secret_access_key => AppConfig[:s3_secret]
+   } 
+   Jammit.upload_to_s3!(s3_configuration)
+   asset_host = "https://#{s3_configuration[:bucket_name]}.s3.amazonaws.com"
+   puts "NOTE: ENV['ASSET_HOST'] is now: #{asset_host}, but you may know your cdn url better than I"
+   puts "Please set this in your ENV hash in a production enviroment"
+  end
 end
\ No newline at end of file