diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb
index f7911842..dfa9bdf5 100644
--- a/lib/middleman/base.rb
+++ b/lib/middleman/base.rb
@@ -124,12 +124,12 @@ module Middleman::Base
   module ClassMethods
     # Override Sinatra's set to accept a block
     # Specifically for the asset_host feature
-    def set(option, value=self, &block)
+    def set(option, value = (not_set = true), ignore_setter = false, &block)
       if block_given?
         value = Proc.new { block }
       end
     
-      super(option, value, &nil)
+      super(option, value, ignore_setter, &nil)
     end
     
     def before_processing(name=:unnamed, idx=-1, &block)
@@ -150,6 +150,10 @@ module Middleman::Base
   end
   
   module InstanceMethods
+    def forward
+      raise ::Sinatra::NotFound
+    end
+  
     # Internal method to look for templates and evaluate them if found
     def process_request(options={})
       if !settings.views.include?(settings.root)
diff --git a/lib/middleman/core_extensions/features.rb b/lib/middleman/core_extensions/features.rb
index 802c253d..e4774e19 100644
--- a/lib/middleman/core_extensions/features.rb
+++ b/lib/middleman/core_extensions/features.rb
@@ -20,7 +20,7 @@
 #     activate MyExtension
 #
 # This will call the `registered` method in your extension and provide you
-# with the `app` parameter which is a Middleman::Server context. From here
+# with the `app` parameter which is a Middleman::Base context. From here
 # you can choose to respond to requests for certain paths or simply attach
 # Rack middleware to the stack.
 #
diff --git a/lib/middleman/features/minify_javascript.rb b/lib/middleman/features/minify_javascript.rb
index d49cb0aa..6d0ccaae 100755
--- a/lib/middleman/features/minify_javascript.rb
+++ b/lib/middleman/features/minify_javascript.rb
@@ -19,7 +19,7 @@ module Middleman::Features::MinifyJavascript
       if env["PATH_INFO"].match(/\.html$/)
         compressor = ::Uglifier.new
 
-        if response.is_a?(::Rack::File) or response.is_a?(::Sinatra::Helpers::StaticFile)
+        if response.is_a?(::Rack::File)# or response.is_a?(::Sinatra::Helpers::StaticFile)
           uncompressed_source = File.read(response.path)
         else
           uncompressed_source = response.join
diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb
index 18d0f21b..61654d57 100644
--- a/lib/middleman/version.rb
+++ b/lib/middleman/version.rb
@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end
diff --git a/middleman-x86-mingw32.gemspec b/middleman-x86-mingw32.gemspec
index 28aecd6c..b2a87819 100644
--- a/middleman-x86-mingw32.gemspec
+++ b/middleman-x86-mingw32.gemspec
@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.2.6"])
+  s.add_dependency("sinatra", ["~> 1.3.0"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
   s.add_dependency("slim", ["~> 1.0.2"])
@@ -51,17 +51,12 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.2"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.2"])
+  s.add_dependency("padrino-core", ["~> 0.10.3"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
   
-  # case s.platform.to_s
-  # when %r{mingw}
-    s.add_dependency("eventmachine", ["1.0.0.beta.3"])
-    s.add_dependency("win32-process", ["~> 0.6.5"])
-    s.add_dependency("rb-fchange")
-  # else
-  #   s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-  # end
+  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  s.add_dependency("win32-process", ["~> 0.6.5"])
+  s.add_dependency("rb-fchange")
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
diff --git a/middleman.gemspec b/middleman.gemspec
index f53322aa..552d74b8 100644
--- a/middleman.gemspec
+++ b/middleman.gemspec
@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.2.6"])
+  s.add_dependency("sinatra", ["~> 1.3.0"])
   # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
@@ -52,24 +52,13 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.2"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.2"])
-  
-  # case s.platform.to_s
-  # when %r{mingw}
-  #   s.add_dependency("eventmachine", ["1.0.0.beta.3"])
-  #   s.add_dependency("win32-process", ["~> 0.6.5"])
-  #   s.add_dependency("rb-fchange")
-  # else
-    # s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-    # s.add_dependency("therubyracer", ["~> 0.9.4"])
-  # end
+  s.add_dependency("padrino-core", ["~> 0.10.3"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
   
   # Development and test
-  # s.add_development_dependency("jquery-rails")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])