use webrick, remove thin/kirk requirements

CHANGELOG

@@ -2,4 +2,6 @@
 =====
 
 - Combine views/ and public/ into a single source/ folder.
-- Support YAML front-matter
+- Support YAML front-matter
+- Blog-aware
+- Sprockets support

bin/mm-server

@@ -66,20 +66,8 @@ if File.exists?(old_views) || File.exists?(old_public)
 end
 
 Middleman::Server.root = @current_path
-app = Middleman::Server.new
+options[:app]    = Middleman::Server.new
+# options[:server] = 'webrick'
 
-# TODO: Remove this
-require 'rubygems'
-
-unless defined?(JRUBY_VERSION)
-  require 'thin'
-  handler = Rack::Handler::Thin
-else
-  require 'kirk'
-  require 'rack/handler/kirk'
-  handler = Rack::Handler::Kirk
-end
-
-handler.run app, options do |inst|
-  puts "== The Middleman is standing watch on port #{options[:Port]}"
-end
+puts "== The Middleman is standing watch on port #{options[:Port]}"
+Rack::Server.new(options).start

middleman.gemspec

@@ -18,10 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("rack", ["~> 1.0"])
-  s.add_runtime_dependency("thin", ["~> 1.2.0"]) unless defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("kirk", ["~> 0.1.8"]) if defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("shotgun", ["~> 0.8.0"])
+  s.add_runtime_dependency("rack", ["~> 1.1"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
@@ -37,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass", ["~> 0.11.1"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
-  # s.add_runtime_dependency("fssm", ["~> 0.2.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rspec", [">= 0"])
   s.add_development_dependency("rocco", [">= 0"]) unless defined?(JRUBY_VERSION)