diff --git a/.gitignore b/.gitignore
index 892e7a40..57bd938a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,29 @@
+# NPM
+npm-debug.log
 node_modules/
+
+# Build artifacts and asset stuff
 build/*
 build/bundle.js
 build/bundle.*.js
 build/main.*.css
 screens
-.DS_STORE
-search_replace.sh
 FontAwesome-Vectors.pdf
 index.html
+
+# Vim swaps
 *.sw*
-npm-debug.log
+
+# Annoying mac stuff
+.DS_STORE
+
+# Casper stuff
 src/__tests__/casperjs/screenshots/*.png
 src/__tests__/casperjs/*.js-e
-AwesomeProject.xcodeproj/**
+
+# Xcode
+*.xcuserstate
+*.xcworkspace
+xcuserdata
+UserInterfaceState.xcuserstate
+xcuserdata/
diff --git a/AwesomeProject.xcodeproj/project.xcworkspace/xcuserdata/pcottle.xcuserdatad/UserInterfaceState.xcuserstate b/AwesomeProject.xcodeproj/project.xcworkspace/xcuserdata/pcottle.xcuserdatad/UserInterfaceState.xcuserstate
index 418d6a05..dff11ddf 100644
Binary files a/AwesomeProject.xcodeproj/project.xcworkspace/xcuserdata/pcottle.xcuserdatad/UserInterfaceState.xcuserstate and b/AwesomeProject.xcodeproj/project.xcworkspace/xcuserdata/pcottle.xcuserdatad/UserInterfaceState.xcuserstate differ