Merge branch 'fix-1022'

Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.

Global/Xcode.gitignore

@@ -11,5 +11,3 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
-*.hmap
-*.ipa

Objective-C.gitignore

@@ -1,3 +1,21 @@
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
@@ -5,4 +23,3 @@
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
 #
 # Pods/
-