diff --git a/.gitignore b/.gitignore
index 68af9a638..062f20fdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,26 @@
+# Project
 Gemfile.lock
+.bundle
+tmp/*
+coverage
+pkg
+
+# Yard documentation
+.yardoc
+yardoc
+
+# IDEs' files
+*.iml
+*.tmproj
+.idea
+tmtags
+
+# Local Ruby settings
 .rspec-local
-*.gem
-lib/1.8
-lib/1.9
-lib/2.0
 .rvmrc
 .ruby-version
 .ruby-gemset
-.bundle/*
-.yardoc
-yardoc
-tmp/*
-man/*
-*.tmproj
-rdoc/*
-*.orig
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-git_pull.txt
-coverage
-critic
+
+# junk
 .DS_Store
-TAGS
-tmtags
-*.sw?
-.idea
-.rbx/*
-lib/**/*.bundle
-lib/**/*.so
-lib/**/*.jar
-ext/**/*.bundle
-ext/**/*.so
-ext/**/*.jar
-pkg
-*.csv
+