diff --git a/.gitignore b/.gitignore
index bc935f4bc..455f60dbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,34 @@
-# OS X
+## OS X
 .DS_Store
 
-# Xcode
-build
+## Build generated
+build/
 DerivedData
-xcuserdata
+
+## Various settings
 *.pbxuser
-*.xcuserdatad
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
 *.xccheckout
-*.swp
-*.gcov
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Dependency Managers
+Pods/
+Carthage/Build
+
+## AppCode
+.idea/
diff --git a/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xcscmblueprint b/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xcscmblueprint
deleted file mode 100644
index fa8350923..000000000
--- a/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xcscmblueprint
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "61C4B9E3B61282127C102C87B46B8CDE985974AE",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
-
-  },
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "61C4B9E3B61282127C102C87B46B8CDE985974AE" : 0,
-    "0DCFF0852789D5A49F67B6C8EA2636735D303748" : 0
-  },
-  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "13F523A8-55A3-4365-9745-D4FE37EC5F20",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "61C4B9E3B61282127C102C87B46B8CDE985974AE" : "bolts-objc\/",
-    "0DCFF0852789D5A49F67B6C8EA2636735D303748" : "bolts-objc\/Vendor\/xctoolchain\/"
-  },
-  "DVTSourceControlWorkspaceBlueprintNameKey" : "Bolts",
-  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
-  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Bolts.xcodeproj",
-  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ParsePlatform\/xctoolchain.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0DCFF0852789D5A49F67B6C8EA2636735D303748"
-    },
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:BoltsFramework\/Bolts-iOS.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "61C4B9E3B61282127C102C87B46B8CDE985974AE"
-    }
-  ]
-}
\ No newline at end of file