gistfile1.diff

diff --git a/config/boot.rb b/config/boot.rb
index 81d20d9..f1a1c10 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -157,5 +157,19 @@ module Spree
   end
 end
 
+class Spree::Boot
+  def run
+    load_initializer
+
+    Spree::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Spree::Initializer.run(:set_load_path)
+  end
+end
+
 # All that for this:
 Spree.boot!
diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 18009cf..ebb8724 100644
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1 +1,22 @@
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end
+
 SPREE_EXTENSIONS_LOAD_ORDER = [:localization, :all, :theme_carhartt, :site]