Merge branch 'master' into site

Rakefile

@@ -24,6 +24,7 @@ posts_dir    = "_posts"    # directory for blog files
 themes_dir   = ".themes"   # directory for blog files
 new_post_ext = "markdown"  # default new post file extension when using the new_post task
 new_page_ext = "markdown"  # default new page file extension when using the new_page task
+server_port  = "4000"      # port for preview server eg. localhost:4000
 
 
 desc "Initial setup for Octopress: copies the default theme into the path of Jekyll's generator. Rake install defaults to rake install[classic] to install a different theme run rake install[some_theme_name]"
@@ -56,7 +57,7 @@ end
 
 desc "preview the site in a web browser"
 task :preview do
-  system "trap 'kill $jekyllPid $compassPid' Exit; jekyll --auto --server & jekyllPid=$!; compass watch & compassPid=$!; wait"
+  system "trap 'kill $jekyllPid $compassPid $rackPid' Exit; jekyll --auto & jekyllPid=$!; compass watch & compassPid=$!; rackup --port #{server_port} & rackPid=$!; wait"
 end
 
 # usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post")
@@ -257,6 +258,6 @@ end
 
 desc "list tasks"
 task :list do
-  puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).to_sentence}"
+  puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).join(', ')}"
   puts "(type rake -T for more detail)\n\n"
 end

_config.yml

@@ -20,7 +20,6 @@ email: brandon@imathis.com
 
 # If publishing to a subdirectory as in http://site.com/project set 'root: /project'
 root: /
-server_port: 4000
 permalink: /blog/:year/:month/:day/:title/
 source: source
 destination: public