diff --git a/Gemfile b/Gemfile
index b0fb8679..fa254dff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec :name => "jekyll"
 gem "rake", "~> 12.0"
 
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
-gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < '2.2.2'
+gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
 
 group :development do
   gem "launchy", "~> 2.3"
@@ -18,15 +18,15 @@ end
 #
 
 group :test do
-  gem "rubocop", "~> 0.44.1"
+  gem "codeclimate-test-reporter", "~> 0.6.0"
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
-  gem "codeclimate-test-reporter", "~> 0.6.0"
-  gem "rspec-mocks"
   gem "nokogiri"
   gem "rspec"
-  gem "test-theme", path: File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
+  gem "rspec-mocks"
+  gem "rubocop", "~> 0.44.1"
+  gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"
 end
@@ -34,54 +34,54 @@ end
 #
 
 group :test_legacy do
-  if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
-    gem 'test-unit'
+  if RUBY_PLATFORM =~ %r!cygwin! || RUBY_VERSION.start_with?("2.2")
+    gem "test-unit"
   end
 
-  gem "redgreen"
-  gem "simplecov"
-  gem "minitest-reporters"
-  gem "minitest-profile"
   gem "minitest"
+  gem "minitest-profile"
+  gem "minitest-reporters"
+  gem "redgreen"
   gem "shoulda"
+  gem "simplecov"
 end
 
 #
 
 group :benchmark do
   if ENV["BENCHMARK"]
-    gem "ruby-prof"
     gem "benchmark-ips"
-    gem "stackprof"
     gem "rbtrace"
+    gem "ruby-prof"
+    gem "stackprof"
   end
 end
 
 #
 
 group :jekyll_optional_dependencies do
-  gem "toml", "~> 0.1.0"
   gem "coderay", "~> 1.1.0"
-  gem "jekyll-docs", :path => '../docs' if Dir.exist?('../docs') && ENV['JEKYLL_VERSION']
-  gem "jekyll-gist"
-  gem "jekyll-feed"
   gem "jekyll-coffeescript"
-  gem "jekyll-redirect-from"
+  gem "jekyll-docs", :path => "../docs" if Dir.exist?("../docs") && ENV["JEKYLL_VERSION"]
+  gem "jekyll-feed"
+  gem "jekyll-gist"
   gem "jekyll-paginate"
-  gem "mime-types", "~> 3.0"
+  gem "jekyll-redirect-from"
   gem "kramdown", "~> 1.9"
+  gem "mime-types", "~> 3.0"
   gem "rdoc", "~> 4.2"
+  gem "toml", "~> 0.1.0"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
-    gem "rdiscount", "~> 2.0"
-    gem "pygments.rb", "~> 0.6.0"
-    gem "redcarpet", "~> 3.2", ">= 3.2.3"
     gem "classifier-reborn", "~> 2.0"
     gem "liquid-c", "~> 3.0"
+    gem "pygments.rb", "~> 0.6.0"
+    gem "rdiscount", "~> 2.0"
+    gem "redcarpet", "~> 3.2", ">= 3.2.3"
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-  gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "tzinfo-data", :platforms => [:mingw, :mswin, :x64_mingw, :jruby]
 end
 
 #
@@ -91,9 +91,9 @@ group :site do
     gem "html-proofer", "~> 2.0"
   end
 
-  gem "jemoji", "0.5.1"
-  gem "jekyll-sitemap"
-  gem "jekyll-seo-tag"
   gem "jekyll-avatar"
   gem "jekyll-mentions"
+  gem "jekyll-seo-tag"
+  gem "jekyll-sitemap"
+  gem "jemoji", "0.5.1"
 end