bin/mongrel_rails in mongrel-1.0.3 vs bin/mongrel_rails in mongrel-1.0.4

@@ -2,16 +2,20 @@
 # You can redistribute it and/or modify it under the same terms as Ruby.
 #
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html
 # for more information.
 
-require 'rubygems'
 require 'yaml'
+require 'etc'
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'mongrel'
 require 'mongrel/rails'
-require 'etc'
 
+# require 'ruby-debug'
+# Debugger.start
+
 module Mongrel
   class Start < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
 
     def configure
@@ -172,18 +176,17 @@
       end
     end
 
     def config_keys
       @config_keys ||=
-        %w(host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script
-           num_processors timeout throttle user group prefix)
+        %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix)
     end
 
     def settings
       config_keys.inject({}) do |hash, key|
         value = self.instance_variable_get("@#{key}")
         key = 'host' if key == 'address'
-        hash[key.to_sym] = value
+        hash[key.to_sym] ||= value
         hash
       end
     end
   end