diff --git a/.gitignore b/.gitignore
index f28bbe4..9f83a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ sass.old
 source.old
 source/_stash
 source/stylesheets/screen.css
+source/javascripts/octopress.min.js
 source/images/icon-*.png
 vendor
 node_modules
diff --git a/Rakefile b/Rakefile
index 8429311..c206e35 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,7 +22,7 @@ deploy_branch  = "master"
 public_dir      = "public"    # compiled site directory
 source_dir      = "source"    # source file directory
 blog_index_dir  = 'source'    # directory for your blog's index page (if you put your index in source/blog/index.html, set this to 'source/blog')
-deploy_dir      = "_deploy"   # deploy directory (for Github pages deployment)
+deploy_dir      = "_deploy"   # deploy directory (for GitHub pages deployment)
 stash_dir       = "_stash"    # directory to stash posts for speedy generation
 posts_dir       = "_posts"    # directory for blog files
 themes_dir      = ".themes"   # directory for blog files
@@ -61,9 +61,9 @@ task :generate do
 end
 
 Rake::Minify.new(:minify_and_combine) do
-  files = FileList.new("source/javascripts/group/*.*")
+  files = FileList.new("#{source_dir}/javascripts/group/*.*")
 
-  output_file =  "source/javascripts/octopress.min.js"
+  output_file =  "#{source_dir}/javascripts/octopress.min.js"
 
   puts "BEGIN Minifying #{output_file}"
   group(output_file) do
@@ -308,7 +308,7 @@ end
 desc "deploy public directory to github pages"
 multitask :push do
   if File.directory?(deploy_dir)
-    puts "## Deploying branch to Github Pages "
+    puts "## Deploying branch to GitHub Pages "
     (Dir["#{deploy_dir}/*"]).each { |f| rm_rf(f) }
     Rake::Task[:copydot].invoke(public_dir, deploy_dir)
     puts "Attempting pull, to sync local deployment repository"
@@ -326,10 +326,10 @@ multitask :push do
       system "git commit -m \"#{message}\""
       puts "\n## Pushing generated #{deploy_dir} website"
       system "git push origin #{deploy_branch}"
-      puts "\n## Github Pages deploy complete"
+      puts "\n## GitHub Pages deploy complete"
     end
   else
-    puts "This project isn't configured for deploying to Github Pages\nPlease run `rake setup_github_pages[your-deployment-repo-url]`." 
+    puts "This project isn't configured for deploying to GitHub Pages\nPlease run `rake setup_github_pages[your-deployment-repo-url]`." 
   end
 end
 
@@ -375,7 +375,7 @@ task :set_root_dir, :dir do |t, args|
   end
 end
 
-desc "Set up _deploy folder and deploy branch for Github Pages deployment"
+desc "Set up _deploy folder and deploy branch for GitHub Pages deployment"
 task :setup_github_pages, :repo do |t, args|
   if args.repo
     repo_url = args.repo
@@ -450,13 +450,13 @@ task :setup_github_pages, :repo do |t, args|
       puts "!! WARNING: Your CNAME points to #{cname} but your _config.yml url is set to #{current_short_url} !!"
       puts "For help with setting up a CNAME follow the guide at http://help.github.com/pages/#custom_domains"
     else
-      puts "Github Pages will host your site at http://#{cname}"
+      puts "GitHub Pages will host your site at http://#{cname}"
     end
   else
-    puts "Github Pages will host your site at #{url}."
+    puts "GitHub Pages will host your site at #{url}."
     puts "To host at \"your-site.com\", configure a CNAME: `echo \"your-domain.com\" > #{source_dir}/CNAME`"
     puts "Then change the url in _config.yml from #{current_url} to http://your-domain.com"
-    puts "Finally, follow the guide at http://help.github.com/pages/#custom_domains for help pointing your domain to Github Pages"
+    puts "Finally, follow the guide at http://help.github.com/pages/#custom_domains for help pointing your domain to GitHub Pages"
   end
   puts "Deploy to #{repo_url} with `rake deploy`"
   puts "Note: generated content is copied into _deploy/ which is not in version control."