diff --git a/History.markdown b/History.markdown
index 8c99c037..4809eb3b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,8 +6,11 @@
 
 ### Bug Fixes
 
+  * Fix Rouge's RedCarpet plugin interface integration (#2951)
   * Remove `--watch` from the site template blog post since it defaults
     to watching in in 2.4.0 (#2922)
+  * Fix code for media query mixin in site template (#2946)
+  * Allow post URL's to have `.htm` extensions (#2925)
 
 ### Development Fixes
 
@@ -27,6 +30,7 @@
   * Added `mathml.rb` to the list of third-party plugins. (#2937)
   * Add `--force_polling` to the list of configuration options (#2943)
   * Escape unicode characters in site CSS (#2906)
+  * Add note about using the github-pages gem via pages.github.com/versions.json (#2939)
 
 ## 2.4.0 / 2014-09-09
 
diff --git a/features/permalinks.feature b/features/permalinks.feature
index f63aaf81..67dfbb47 100644
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -83,3 +83,13 @@ Feature: Fancy permalinks
     Then the _site directory should exist
     And the _site/custom/posts directory should exist
     And I should see "bla bla" in "_site/custom/posts/some.html"
+
+  Scenario: Use per-post ending in .htm
+    Given I have a _posts directory
+    And I have the following post:
+      | title     | date       | permalink               | content |
+      | Some post | 2013-04-14 | /custom/posts/some.htm  | bla bla |
+    When I run jekyll build
+    Then the _site directory should exist
+    And the _site/custom/posts directory should exist
+    And I should see "bla bla" in "_site/custom/posts/some.htm"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 8371c91e..91173067 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -62,5 +62,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('activesupport', '~> 3.2.13')
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
-  s.add_development_dependency('rouge', '~> 1.3')
+  s.add_development_dependency('rouge', '~> 1.7')
 end
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index b69df9b8..468069e9 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -48,8 +48,8 @@ module Jekyll
           end
 
           protected
-          def rouge_formatter(opts = {})
-            Rouge::Formatters::HTML.new(opts.merge(wrap: false))
+          def rouge_formatter(lexer)
+            Rouge::Formatters::HTML.new(:wrap => false)
           end
         end
 
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index b13deff8..293e2c5d 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -269,7 +269,7 @@ module Jekyll
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
       path = Jekyll.sanitized_path(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html$/].nil?
+      path = File.join(path, "index.html") if path[/\.html?$/].nil?
       path
     end
 
diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss
index f03d1c3d..5415d8bc 100755
--- a/lib/site_template/css/main.scss
+++ b/lib/site_template/css/main.scss
@@ -27,7 +27,7 @@ $on-laptop:        800px;
 
 
 // Using media queries with like this:
-// @include media-query($palm) {
+// @include media-query($on-palm) {
 //     .wrapper {
 //         padding-right: $spacing-unit / 2;
 //         padding-left: $spacing-unit / 2;
diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index b8bf4d33..83af0b3c 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -19,6 +19,33 @@ There are two basic types available: user/organization pages and project pages.
 The way to deploy these two types of sites are nearly identical, except for a
 few minor details.
 
+<div class="note protip">
+  <h5>Use the <code>github-pages</code> gem</h5>
+  <p>
+    Our friends at GitHub have provided the
+    <a href="https://github.com/github/pages-gem">github-pages</a>
+    gem which is used to manage Jekyll and its dependencies on
+    GitHub Pages. Using it in your projects means that when you deploy
+    your site to GitHub Pages, you will not be caught by unexpected
+    differences between various versions of the gems. To use the
+    currently-deployed version of the gem in your project, add the
+    following to your <code>Gemfile</code>:
+
+{% highlight ruby %}
+source 'https://rubygems.org'
+
+require 'json'
+require 'open-uri'
+versions = JSON.parse(open('https://pages.github.com/versions.json').read)
+
+gem 'github-pages', versions['github-pages']
+{% endhighlight %}
+
+    This will ensure that when you run <code>bundle install</code>, you
+    have the correct version of the <code>github-pages</code> gem.
+  </p>
+</div>
+
 ### User and Organization Pages
 
 User and organization pages live in a special GitHub repository dedicated to