diff --git a/.travis.yml b/.travis.yml
index 492342aa..71acb01f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ rvm:
 os:
   - linux
   - osx
+cache: bundler
+sudo: false
 matrix:
   fast_finish: true
   allow_failures:
diff --git a/Gemfile b/Gemfile
index 21951896..7c355f39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'pry', '~> 0.10', group: :development
 gem 'aruba', '~> 0.7.4'
 gem 'rspec', '~> 3.0'
 gem 'fivemat', '~> 1.3'
-gem 'cucumber', '~> 2.0'
+gem 'cucumber', '~> 1.3'
 
 # Optional middleman dependencies, included for tests
 gem 'less', '2.3', require: false
diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature
index 4647e7eb..aed75b7c 100644
--- a/middleman-core/features/chained_templates.feature
+++ b/middleman-core/features/chained_templates.feature
@@ -13,13 +13,13 @@ Feature: Templates should be chainable
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-      | test.html.combobreaker                        |
+      | test.erb.combobreaker                        |
     And the file "index.html" should contain "Title</h1>"
     And the file "index.html" should contain "Subtitle</h2>"
     And the file "index.html" should contain "Sup</h3>"
-    And the file "test.html.combobreaker.html" should contain "Title</h1>"
-    And the file "test.html.combobreaker.html" should contain "Subtitle</h2>"
-    And the file "test.html.combobreaker.html" should contain "Sup</h3>"
+    And the file "test.erb.combobreaker" should contain "Title</h1>"
+    And the file "test.erb.combobreaker" should contain "Subtitle</h2>"
+    And the file "test.erb.combobreaker" should contain "Sup</h3>"
 
   Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb
     Given a fixture app "partial-chained_templates-app"
diff --git a/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb b/middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb
similarity index 100%
rename from middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb
rename to middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb
diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 589a8ab6..a5541349 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -242,7 +242,7 @@ module Middleman
       # @return [String]
       def remove_templating_extensions(path)
         # Strip templating extensions as long as Tilt knows them
-        path = path.sub(File.extname(path), '') while ::Tilt[path]
+        path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '') while ::Tilt[path]
         path
       end
 
diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
index 52a13d6e..0d2d7a92 100644
--- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
+++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
@@ -75,7 +75,6 @@ end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
   in_current_directory do
-
     expect{ visit(URI.encode(url).to_s) }.to_not raise_exception
   end
 end