diff --git a/.gitignore b/.gitignore
index cd09ecdc..0a9754ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,15 +19,13 @@ rails_3_gems
 doc/performance.txt
 doc/production.sh
 doc/DONE
+doc/dev.txt
 *.gem
 tmp/*
 .rvmrc
 Capfile
 config/deploy.rb
 perf/test.rb
-<<<<<<< HEAD
 gem_graph.png
 sites/
-=======
-sites
->>>>>>> theme
+
diff --git a/Gemfile b/Gemfile
index 317680f7..acf46466 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'rmagick', '= 2.12.2'
 gem 'locomotive_carrierwave', :require => 'carrierwave'
 
 gem 'custom_fields', '1.0.0.beta'
-gem 'fog'
+gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'
 gem 'heroku'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b094f94..304853dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
     carrierwave (0.5.0)
       activesupport (~> 3.0.0)
     cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.0.7)
+    childprocess (0.0.9)
       ffi (~> 0.6.3)
     columnize (0.3.1)
     configuration (1.1.0)
@@ -104,9 +104,9 @@ GEM
     fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
-    fog (0.3.8)
+    fog (0.3.7)
       builder
-      excon (>= 0.2.4)
+      excon (>= 0.2.3)
       formatador (>= 0.0.15)
       json
       mime-types
@@ -245,7 +245,7 @@ DEPENDENCIES
   devise (= 1.1.3)
   factory_girl_rails
   fastthread
-  fog
+  fog (= 0.3.7)
   formtastic (>= 1.1.0)
   growl-glue
   haml (= 3.0.18)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 15590651..4941484e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -32,4 +32,4 @@ end
 CarrierWave.configure do |config|
   config.storage = :file
   config.root = File.join(Rails.root, 'public')
-end
+end
\ No newline at end of file
diff --git a/lib/locomotive/delayed_job.rb b/lib/locomotive/delayed_job.rb
index f6626294..dacd27e3 100644
--- a/lib/locomotive/delayed_job.rb
+++ b/lib/locomotive/delayed_job.rb
@@ -1,5 +1,4 @@
-require 'delayed_job'
-require 'delayed/backend/mongoid'
+require 'delayed_job_mongoid'
 
 module Delayed
   module Backend
diff --git a/lib/locomotive/engine.rb b/lib/locomotive/engine.rb
index 2503454b..cd7c41a9 100644
--- a/lib/locomotive/engine.rb
+++ b/lib/locomotive/engine.rb
@@ -1,5 +1,8 @@
-puts "...Locomotive engine loaded"
+puts "...loading Locomotive engine"
 
+require 'rails'
+require 'heroku'
+require 'inherited_resources'
 require 'mimetype_fu'
 require 'liquid'
 require 'devise'
@@ -12,9 +15,16 @@ require 'redcloth'
 require 'actionmailer_with_request'
 require 'zip/zipfilesystem'
 require 'custom_fields'
+require 'delayed_job_mongoid'
+
+$:.unshift File.dirname(__FILE__)
 
 module Locomotive
   class Engine < Rails::Engine
 
+    rake_tasks do
+      load "railties/tasks.rake"
+    end
+
   end
 end
diff --git a/lib/locomotive/heroku.rb b/lib/locomotive/heroku.rb
index d0a809cb..e667778a 100644
--- a/lib/locomotive/heroku.rb
+++ b/lib/locomotive/heroku.rb
@@ -1,4 +1,5 @@
 require 'heroku'
+require 'heroku/client'
 require 'locomotive/heroku/custom_domain'
 
 module Locomotive
diff --git a/lib/locomotive/inherited_resources.rb b/lib/locomotive/inherited_resources.rb
index edf1366a..4d8a5e1e 100644
--- a/lib/locomotive/inherited_resources.rb
+++ b/lib/locomotive/inherited_resources.rb
@@ -1,3 +1,4 @@
+require 'responders'
 require 'inherited_resources'
 require 'inherited_resources/actions'
 require 'inherited_resources/responder'
diff --git a/lib/locomotive/railties/tasks.rake b/lib/locomotive/railties/tasks.rake
new file mode 100644
index 00000000..4bcb080f
--- /dev/null
+++ b/lib/locomotive/railties/tasks.rake
@@ -0,0 +1,16 @@
+# Re-definitions are appended to existing tasks
+
+namespace :locomotive do
+  namespace :jobs do
+    desc "Clear the delayed_job queue."
+    task :clear => :environment do
+      Delayed::Job.delete_all
+    end
+
+    desc "Start a delayed_job worker."
+    task :work => :environment do
+      puts "Delayed::Job.new = #{Delayed::Job.new.inspect}"
+      ::Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb
index ba1cb15b..33062049 100644
--- a/lib/locomotive/version.rb
+++ b/lib/locomotive/version.rb
@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.4"
+  VERSION = "0.0.4.beta1"
 end
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index f4bbe59d..fc30a26c 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog"
   s.add_dependency "mimetype-fu"
   s.add_dependency "formtastic", ">= 1.1.0"
-  s.add_dependency "locomotive_carrierwave"
+  s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta1"
   s.add_dependency "actionmailer-with-request"
   s.add_dependency "heroku"
   s.add_dependency "httparty", ">= 0.6.1"