diff --git a/.gitignore b/.gitignore
index cc31b76..93c86d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,37 @@
+# OS X
 .DS_Store
-.Trashes
-*.swp
-*.lock
-profile
-*~.nib
-DerivedData/
+
+# Xcode
 build/
 *.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
 !default.pbxuser
+*.mode1v3
 !default.mode1v3
+*.mode2v3
 !default.mode2v3
+*.perspectivev3
 !default.perspectivev3
-*.moved-aside
-Pods/
-Podfile.lock
-*.xcuserstate
-.idea/
-xcuserdata/
-project.xcworkspace/
 xcuserdata/
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+
+# Bundler
+.bundle
+
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+# 
+# Note: if you ignore the Pods directory, make sure to uncomment
+# `pod install` in .travis.yml
+#
+# Pods/