Merge branch 'master' of github.com:middleman/middleman

Gemfile

@@ -5,38 +5,38 @@ gem 'rake', '~> 10.3', require: false
 gem 'yard', '~> 0.9.11', require: false
 
 # Test tools
-gem 'byebug'
-gem 'aruba', '~> 0.14.0', require: false
-gem 'rspec', '~> 3.0', require: false
-gem 'cucumber', '~> 3.0', require: false
 gem 'addressable', '~> 2.4', require: false
+gem 'aruba', '~> 0.14.0', require: false
+gem 'byebug'
+gem 'cucumber', '~> 3.0', require: false
+gem 'rspec', '~> 3.0', require: false
 
 # Pry tools
 gem 'pry'
-gem 'pry-stack_explorer'
 gem 'pry-rescue'
+gem 'pry-stack_explorer'
 
 # Optional middleman dependencies, included for tests
-gem 'haml', '>= 4.0.5', require: false
-gem 'sassc', '~> 1.10', require: false
 gem 'coffee-script', '~> 2.2', require: false
+gem 'haml', '>= 4.0.5', require: false
 gem 'kramdown', '~> 1.2', require: false
-gem 'slim', '>= 2.0', require: false
 gem 'liquid', '>= 3.0', require: false
-gem 'stylus', '>= 1.0', require: false
-gem 'sinatra', '>= 2.0.0.beta2', require: false
 gem 'redcarpet', '>= 3.1', require: false
+gem 'sassc', '~> 1.10', require: false
+gem 'sinatra', '>= 2.0.0.beta2', require: false
+gem 'slim', '>= 2.0', require: false
+gem 'stylus', '>= 1.0', require: false
 
 # Dns server to test preview server
 gem 'rubydns', '~> 1.0.1', require: false
 
 # To test javascript
-gem 'poltergeist', '~> 1.8', require: false
 gem 'phantomjs', '~> 2.1.1.0', require: false
+gem 'poltergeist', '~> 1.8', require: false
 
 # For less, note there is no compatible JS runtime for windows
-gem 'therubyrhino', '>= 2.0', platforms: :jruby
 gem 'therubyracer', '~> 0.12.3', platforms: :ruby
+gem 'therubyrhino', '>= 2.0', platforms: :jruby
 
 # Code Quality
 gem 'rubocop', '~> 0.52', require: false