diff --git a/Gemfile b/Gemfile
index 92aeefd9503..ef02bd1b50e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,8 +112,12 @@ gem 'fast_blank' #, github: "SamSaffron/fast_blank"
 
 # IMPORTANT: mini profiler monkey patches, so it better be required last
 #  If you want to amend mini profiler to do the monkey patches in the railstie
-#  we are open to it.
-gem 'rack-mini-profiler' #, git: 'git://github.com/SamSaffron/MiniProfiler'
+#  we are open to it. by deferring require to the initializer we can configure disourse installs without it
+gem 'rack-mini-profiler', require: false  # require: false #, git: 'git://github.com/SamSaffron/MiniProfiler'
+
+# used for caching, optional
+gem 'redis-rack-cache', require: false
+gem 'rack-cache', require: false
 
 # perftools only works on 1.9 atm
 group :profile do
diff --git a/Gemfile.lock b/Gemfile.lock
index b9a7c112757..340090ab075 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mini-profiler (0.1.25)
+    rack-mini-profiler (0.1.26)
       rack (>= 1.1.3)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -367,6 +367,9 @@ GEM
     redis-rack (1.4.2)
       rack (~> 1.4.1)
       redis-store (~> 1.1.0)
+    redis-rack-cache (1.2.1)
+      rack-cache (~> 1.2)
+      redis-store (~> 1.1.0)
     redis-rails (3.2.3)
       redis-actionpack (~> 3.2.3)
       redis-activesupport (~> 3.2.3)
@@ -514,6 +517,7 @@ DEPENDENCIES
   openid-redis-store
   pg
   pry-rails
+  rack-cache
   rack-mini-profiler
   rails
   rails_multisite!
@@ -522,6 +526,7 @@ DEPENDENCIES
   rb-inotify (~> 0.8.8)
   redcarpet
   redis
+  redis-rack-cache
   redis-rails
   rest-client
   rinku
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0b423b527d4..e0e744af2a0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -140,7 +140,7 @@ class ApplicationController < ActionController::Base
 
   def can_cache_content?
     # Don't cache unless we're in production mode
-    return false unless Rails.env.production?
+    return false unless Rails.env.production? || Rails.env == "profile"
 
     # Don't cache logged in users
     return false if current_user.present?
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index ca98cbf72d5..1c6a62c0e85 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -6,6 +6,7 @@ class CategoriesController < ApplicationController
 
   def index
     list = CategoryList.new(current_user)
+    discourse_expires_in 1.minute
     render_serialized(list, CategoryListSerializer)
   end
 
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index c0c6ead0c4d..72b8f05d4ca 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -16,21 +16,11 @@
 
 <%# load the selected locale before any other scripts %>
 <%= javascript_include_tag "locales/#{I18n.locale}" %>
-
-<%- if mini_profiler_enabled? %>
-  <%- Rack::MiniProfiler.step "application" do %>
-    <%= javascript_include_tag "application" %>
-  <%-end%>
-
-  <%- Rack::MiniProfiler.step "admin" do %>
-    <%= javascript_include_tag "admin"%>
-  <%-end%>
-<%- else %>
-  <%= javascript_include_tag "application" %>
-  <%- if admin? %>
-    <%= javascript_include_tag "admin"%>
-  <%- end %>
-<%- end%>
+<%= javascript_include_tag "application" %>
+<%= javascript_include_tag "admin"%>
+<%- if admin? %>
+  <%= javascript_include_tag "admin"%>
+<%- end %>
 
 <script>
   Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host  %>';
diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index 4569a146340..87b248f024e 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -1,12 +1,8 @@
-    <%- unless SiteCustomization.override_default_style(session[:preview_style]) %>
-      <%=stylesheet_link_tag "application"%>
-    <%- end %>
+<%- unless SiteCustomization.override_default_style(session[:preview_style]) %>
+  <%=stylesheet_link_tag "application"%>
+<%- end %>
 
-    <%- if mini_profiler_enabled? %>
-      <%- Rack::MiniProfiler.step "stylsheet" do%>
-        <%= stylesheet_link_tag "admin"%>
-      <%-end%>
-    <%- elsif admin? %>
-      <%= stylesheet_link_tag "admin"%>
-    <%-end%>
-    <%=SiteCustomization.custom_stylesheet(session[:preview_style])%>
+<%- if admin? %>
+  <%= stylesheet_link_tag "admin"%>
+<%-end%>
+<%=SiteCustomization.custom_stylesheet(session[:preview_style])%>
diff --git a/app/views/layouts/no_js.html.erb b/app/views/layouts/no_js.html.erb
index 3cc0db48950..8b34cdb7e1e 100644
--- a/app/views/layouts/no_js.html.erb
+++ b/app/views/layouts/no_js.html.erb
@@ -8,21 +8,9 @@
     <meta content="" name="author">
     <link rel="icon" type="image/png" href=<%=SiteSetting.favicon_url%>>
 
-    <%- if mini_profiler_enabled? %>
-      <%- Rack::MiniProfiler.step "stylsheet" do%>
-        <%=stylesheet_link_tag "application"%>
-      <%- end %>
-      <%- if current_user.try(:admin) %>
-        <%- Rack::MiniProfiler.step "stylsheet" do%>
-          <%= stylesheet_link_tag "admin"%>
-        <%-end%>
-      <%- end %>
-
-    <%- else %>
-      <%=stylesheet_link_tag "application"%>
-      <%- if current_user.try(:admin) %>
-        <%= stylesheet_link_tag "admin"%>
-      <%- end %>
+    <%=stylesheet_link_tag "application"%>
+    <%- if current_user.try(:admin) %>
+      <%= stylesheet_link_tag "admin"%>
     <%- end %>
 
     <%=csrf_meta_tags%>
diff --git a/config/application.rb b/config/application.rb
index 5bbd27675f4..027e3f00d6d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -92,9 +92,15 @@ module Discourse
     # Use redis for our cache
     config.cache_store = DiscourseRedis.new_redis_store
 
-    # Test with rack::cache disabled. Nginx does this for us
+    # we configure rack cache on demand in an initializer
+    # our setup does not use rack cache and instead defers to nginx
     config.action_dispatch.rack_cache =  nil
 
+    # ember stuff only used for asset precompliation, production variant plays up
+    config.ember.variant = :development
+    config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external_production/ember.js"
+    config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.3.js"
+
     # So open id logs somewhere sane
     config.after_initialize do
       OpenID::Util.logger = Rails.logger
diff --git a/config/environments/development.rb b/config/environments/development.rb
index dd3074e7235..98f7d9597a2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -29,15 +29,15 @@ Discourse::Application.configure do
   config.watchable_dirs['lib'] = [:rb]
 
   config.sass.debug_info = false
-  config.ember.variant = :development
-  config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.3.js"
-  config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external/ember.js"
   config.handlebars.precompile = false
 
+  # we recommend you use mailcatcher https://github.com/sj26/mailcatcher
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
   config.action_mailer.raise_delivery_errors = true
 
   BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
+
+  config.enable_mini_profiler = true
 end
 
diff --git a/config/environments/production.rb b/config/environments/production.sample.rb
similarity index 62%
rename from config/environments/production.rb
rename to config/environments/production.sample.rb
index 2af04cf03e1..726a8810131 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.sample.rb
@@ -27,17 +27,32 @@ Discourse::Application.configure do
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
 
+
+  # you may use other configuration here for mail eg: sendgrid
+
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :address              => "smtp.sendgrid.net",
+  #   :port                 => 587,
+  #   :domain               => 'YOUR DOMAIN',
+  #   :user_name            => 'YOUR_USER',
+  #   :password             => 'YOUR_PASSWORD',
+  #   :authentication       => 'plain',
+  #   :enable_starttls_auto => true  }
+
   config.action_mailer.delivery_method = :sendmail
   config.action_mailer.sendmail_settings = {arguments: '-i'}
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-  # I dunno ... perhaps the built-in minifier is using closure
-  #   regardless it is blowing up
-  config.ember.variant = :development
-  config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external_production/ember.js"
-  config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.3.js"
+  # this will cause all handlebars templates to be pre-compiles, making your page faster
   config.handlebars.precompile = true
 
+  # this setting enables rack_cache so it caches various requests in redis
+  config.enable_rack_cache = true
+
+  # allows admins to use mini profiler
+  config.enable_mini_profiler = true
+
 end
diff --git a/config/environments/profile.rb b/config/environments/profile.rb
index 97db037d7f5..98e74548da0 100644
--- a/config/environments/profile.rb
+++ b/config/environments/profile.rb
@@ -33,13 +33,15 @@ Discourse::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-  # I dunno ... perhaps the built-in minifier is using closure
-  #   regardless it is blowing up
-  config.ember.variant = :development
-  config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external_production/ember.js"
-  config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.3.js"
+  # precompile handlebar assets
   config.handlebars.precompile = true
 
-  # config.middleware.use ::Rack::PerftoolsProfiler, default_printer: 'gif'
+  # this setting enable rack_cache so it caches various requests in redis
+  config.enable_rack_cache = false
 
+  # allows users to use mini profiler
+  config.enable_mini_profiler = false
+
+  # for profiling with perftools
+  # config.middleware.use ::Rack::PerftoolsProfiler, default_printer: 'gif'
 end
diff --git a/config/initializers/mini_profiler.rb b/config/initializers/06-mini_profiler.rb
similarity index 92%
rename from config/initializers/mini_profiler.rb
rename to config/initializers/06-mini_profiler.rb
index 7427c5b1878..44752832d85 100644
--- a/config/initializers/mini_profiler.rb
+++ b/config/initializers/06-mini_profiler.rb
@@ -1,4 +1,10 @@
 # If Mini Profiler is included via gem
+if Rails.configuration.respond_to?(:enable_mini_profiler) && Rails.configuration.enable_mini_profiler
+  require 'rack-mini-profiler'
+  # initialization is skipped so trigger it
+  Rack::MiniProfilerRails.initialize!(Rails.application)
+end
+
 if defined?(Rack::MiniProfiler)
 
   # note, we may want to add some extra security here that disables mini profiler in a multi hosted env unless user global admin
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/07-backtrace_silencers.rb
similarity index 100%
rename from config/initializers/backtrace_silencers.rb
rename to config/initializers/07-backtrace_silencers.rb
diff --git a/config/initializers/99-rack-cache.rb b/config/initializers/99-rack-cache.rb
new file mode 100644
index 00000000000..44595c26d98
--- /dev/null
+++ b/config/initializers/99-rack-cache.rb
@@ -0,0 +1,11 @@
+if Rails.configuration.respond_to?(:enable_rack_cache) && Rails.configuration.enable_rack_cache
+  require 'rack-cache'
+  require 'redis-rack-cache'
+
+  url = DiscourseRedis.url
+
+  Rails.configuration.middleware.insert 0, Rack::Cache,
+    metastore: "#{url}/metastore",
+    entitystore: "#{url}/entitystore",
+    verbose: !Rails.env.production?
+end
diff --git a/lib/current_user.rb b/lib/current_user.rb
index 05136ff4c7c..d909e5d1fb5 100644
--- a/lib/current_user.rb
+++ b/lib/current_user.rb
@@ -1,5 +1,11 @@
 module CurrentUser
 
+  def self.has_auth_cookie?(env)
+    request = Rack::Request.new(env)
+    cookie = request.cookies["_t"]
+    !cookie.nil? && cookie.length == 32
+  end
+
   def self.lookup_from_env(env)
     request = Rack::Request.new(env)
     lookup_from_auth_token(request.cookies["_t"])
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index cc0cd4996f5..853b5ee85c9 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -11,7 +11,12 @@ class DiscourseRedis
   end
 
   def self.config
-    YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env]
+    @config ||= YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env]
+  end
+
+  def self.url(config=nil)
+    config ||= self.config
+    "redis://#{(':' + config['password'] + '@') if config['password']}#{config['host']}:#{config['port']}/#{config['db']}"
   end
 
   def initialize
@@ -19,6 +24,10 @@ class DiscourseRedis
     @redis = DiscourseRedis.raw_connection(@config)
   end
 
+  def url
+    self.class.url(@config)
+  end
+
   # prefix the key with the namespace
   def method_missing(meth, *args, &block)
     if @redis.respond_to?(meth)
@@ -52,8 +61,5 @@ class DiscourseRedis
     redis_store
   end
 
-  def url
-    "redis://#{(':' + @config['password'] + '@') if @config['password']}#{@config['host']}:#{@config['port']}/#{@config['db']}"
-  end
 
 end