diff --git a/middleman-core/lib/middleman-core.rb b/middleman-core/lib/middleman-core.rb
index 02504181..365be09a 100755
--- a/middleman-core/lib/middleman-core.rb
+++ b/middleman-core/lib/middleman-core.rb
@@ -235,7 +235,9 @@ module Middleman
     #
     # @return [Class]
     def server(&block)
-      Class.new(Middleman::Base)
+      @@servercounter ||= 1
+      @@servercounter += 1
+      const_set("MiddlemanBase#{@@servercounter}", Class.new(Middleman::Base))
     end
 
     # Creates a new Rack::Server
diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
index d43d29fe..d9a55fa3 100644
--- a/middleman-core/lib/middleman-core/cli/build.rb
+++ b/middleman-core/lib/middleman-core/cli/build.rb
@@ -16,16 +16,11 @@ module Middleman::Cli
     namespace :build
     
     desc "build [options]", "Builds the static site for deployment"
-    method_option :relative, 
-      :type    => :boolean, 
-      :aliases => "-r", 
-      :default => false, 
-      :desc    => 'Force relative urls'
     method_option :clean, 
       :type    => :boolean, 
       :aliases => "-c", 
       :default => false, 
-      :desc    => 'Removes orpahand files or directories from build'
+      :desc    => 'Removes orphaned files or directories from build'
     method_option :glob, 
       :type    => :string, 
       :aliases => "-g", 
@@ -46,10 +41,6 @@ module Middleman::Cli
       
       self.class.shared_instance(options["verbose"] || false)
       
-      if options.has_key?("relative") && options["relative"]
-        self.class.shared_instance.activate :relative_assets
-      end
-    
       self.class.shared_rack
 
       opts = {}
@@ -106,7 +97,7 @@ module Middleman::Cli
     #
     # @param [Middleman::Sitemap::Page] page
     # @return [void]
-    def tilt_template(page)
+    def render_to_file(page)
       build_dir = self.class.shared_instance.build_dir
       output_file = File.join(self.class.shared_instance.build_dir, page.destination_path)
 
@@ -223,7 +214,7 @@ module Middleman::Cli
         next if page.ignored?
         next if @config[:glob] && !File.fnmatch(@config[:glob], page.path)
 
-        base.tilt_template(page)
+        base.render_to_file(page)
 
         output_path = File.join(@destination, page.destination_path)
         @cleaning_queue.delete(Pathname.new(output_path).realpath) if cleaning?