[Gemfile] Revert custom branches to master

Gemfile

@@ -15,13 +15,13 @@ gem 'json', '1.7.7'
 
 group :development do
   cp_gem 'claide',               'CLAide'
-  cp_gem 'cocoapods-core',       'Core',                'swift'
+  cp_gem 'cocoapods-core',       'Core'
   cp_gem 'cocoapods-downloader', 'cocoapods-downloader'
   cp_gem 'cocoapods-plugins',    'cocoapods-plugins'
   cp_gem 'cocoapods-trunk',      'cocoapods-trunk'
   cp_gem 'cocoapods-try',        'cocoapods-try'
   cp_gem 'molinillo',            'Molinillo'
-  cp_gem 'xcodeproj',            'Xcodeproj',           'ext_build_settings'
+  cp_gem 'xcodeproj',            'Xcodeproj'
 
   gem 'cocoapods-dependencies'
 

Gemfile.lock

@@ -7,8 +7,8 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 8bfbc96858947f4db6dd1f4a3ea085b446ad35d3
-  branch: swift
+  revision: 8c0ae5660c5627163a912eaf93a967e9564b835a
+  branch: master
   specs:
     cocoapods-core (0.35.0)
       activesupport (>= 3.2.15)
@@ -24,8 +24,8 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 7163b7ac8532e7764cf6ec1c1ab89af729413a5b
-  branch: ext_build_settings
+  revision: 2ef226943bf432aef0b610fcbe8b99e9ae9ef1f8
+  branch: master
   specs:
     xcodeproj (0.21.0)
       activesupport (>= 3)