diff --git a/.gitignore b/.gitignore
index a9106f2..99b4255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,23 @@
+## MAC OS
 .DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.yardoc/*
 spec/db/*