fix gemfile conflict

middleman-core/features/gzip.feature

@@ -9,7 +9,7 @@ Feature: GZIP assets during build
       | build/javascripts/test.js.gz |
       | build/stylesheets/test.css |
       | build/stylesheets/test.css.gz |
-    And build/javascripts/test.js.gz should be binary
+    And the file "build/javascripts/test.js.gz" should be gzipped
 
   Scenario: Preview server doesn't change
     Given the Server is running at "gzip-app"

middleman-core/lib/middleman-core/step_definitions/builder_steps.rb

@@ -72,6 +72,6 @@ Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
   check_file_content(file, partial_content, true)
 end
 
-And /(.*) should be binary/ do |file|
+And /the file "(.*)" should be gzipped/ do |file|
   expect(File.binread(File.join(current_dir, file), 2)).to eq(['1F8B'].pack('H*'))
 end

middleman-core/lib/middleman-core/step_definitions/server_steps.rb

@@ -68,7 +68,7 @@ When /^I go to "([^\"]*)"$/ do |url|
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  expect(lambda { @browser.get(URI.escape(url)) }).to_not raise_exception
+  expect{ @browser.get(URI.escape(url)) }.to_not raise_exception
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|