Merge branch 'master' of github.com:imathis/octopress

Rakefile

@@ -1,6 +1,10 @@
 require "rubygems"
 require "bundler/setup"
 
+# If you customize your site's index page setting custom_index to true
+# will preserve your changes when running `rake update_source`
+custom_index = false
+
 ## -- Rsync Deploy config -- ##
 # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
 ssh_user       = "user@domain.com"
@@ -151,6 +155,7 @@ task :update_source, :theme do |t, args|
   system "mkdir -p #{source_dir}; cp -R #{themes_dir}/"+theme+"/source/. #{source_dir}"
   system "cp -Rn #{source_dir}.old/. #{source_dir}"
   system "cp -Rf #{source_dir}.old/_includes/custom/. #{source_dir}/_includes/custom/"
+  system "cp -Rf #{source_dir}.old/index.html #{source_dir}" if custom_index
   puts "## Updated #{source_dir} ##"
 end
 
@@ -252,6 +257,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