Remove forked json

Gemfile

@@ -18,11 +18,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-# This is the version that ships with OS X 10.10, so be sure we test against it.
-# At the same time, the 1.7.7 version won't install cleanly on Ruby > 2.2,
-# so we use a fork that makes a trivial change to a macro invocation.
-gem 'json', :git => 'https://github.com/segiddins/json.git', :branch => 'seg-1.7.7-ruby-2.2'
-
 group :development do
   cp_gem 'claide',                'CLAide'
   cp_gem 'cocoapods-core',        'Core'

Gemfile.lock

@@ -99,13 +99,6 @@ GIT
   specs:
     bacon (1.2.0)
 
-GIT
-  remote: https://github.com/segiddins/json.git
-  revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907
-  branch: seg-1.7.7-ruby-2.2
-  specs:
-    json (1.7.7)
-
 PATH
   remote: .
   specs:
@@ -203,6 +196,7 @@ GEM
     inch_by_inch (1.0.1)
       inch (~> 0.8.0)
       rake (~> 10.0)
+    json (2.5.1)
     kicker (3.0.0)
       listen (~> 1.3.0)
       notify (~> 0.5.2)
@@ -312,7 +306,6 @@ DEPENDENCIES
   danger (~> 5.3)
   diffy
   inch_by_inch
-  json!
   kicker
   mocha (< 1.5)
   mocha-on-bacon