Remove jRuby hacks

lib/middleman.rb

@@ -226,13 +226,10 @@ module Middleman
     
       app_class = options[:app] ||= ::Middleman.server.inst
       opts[:app] = app_class
-      opts[:server] = if ::Middleman::JRUBY
+    
-        'webrick' # Maybe Kirk?
-      else
       require "thin"
       ::Thin::Logging.silent = !options[:logging]
-        'thin'
+      opts[:server] = 'thin'
-      end
       
       server = ::Rack::Server.new(opts)
       server.start

lib/middleman/base.rb

@@ -1,5 +1,6 @@
 # Built on Rack
 require "rack"
+require "rack/file"
 
 # Using Tilt for templating
 require "tilt"

lib/middleman/guard.rb

@@ -45,13 +45,8 @@ module Guard
     
     # Start Middleman in a fork
     def start
-      if ::Middleman::JRUBY
-        thread = Thread.new { bootup }
-        thread.join
-      else
       @server_job = fork { bootup }
     end
-    end
     
     def bootup
       env = (@options[:environment] || "development").to_sym
@@ -73,13 +68,10 @@ module Guard
     # Stop the forked Middleman
     def stop
       puts "== The Middleman is shutting down"
-      if ::Middleman::JRUBY
-      else
       Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
       Process.wait @server_job
       @server_job = nil
     end
-    end
     
     # Simply stop, then start
     def reload