Remove command options from default config

Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.

lib/jekyll.rb

@@ -51,26 +51,22 @@ require_all 'jekyll/tags'
 module Jekyll
   VERSION = '0.11.2'
 
-  # Default options. Overriden by values in _config.yml or command-line opts.
+  # Default options. Overriden by values in _config.yml.
   # Strings rather than symbols are used for compatability with YAML.
   DEFAULTS = {
-    'safe'          => false,
-    'auto'          => false,
-    'server'        => false,
-    'server_port'   => 4000,
-
     'source'        => Dir.pwd,
     'destination'   => File.join(Dir.pwd, '_site'),
+
     'plugins'       => File.join(Dir.pwd, '_plugins'),
     'layouts'       => '_layouts',
 
-    'future'        => true,
-    'lsi'           => false,
-    'pygments'      => false,
-    'markdown'      => 'maruku',
-    'permalink'     => 'date',
-    'include'       => ['.htaccess'],
-    'paginate_path' => 'page:num',
+    'future'        => true,           # remove and make true just default
+    'pygments'      => false,          # remove and make true just default
+
+    'markdown'      => 'maruku',       # no longer a command option
+    'permalink'     => 'date',         # no longer a command option
+    'include'       => ['.htaccess'],  # no longer a command option
+    'paginate_path' => 'page:num',     # no longer a command option
 
     'markdown_ext'  => 'markdown,mkd,mkdn,md',
     'textile_ext'   => 'textile',