diff --git a/.gitignore b/.gitignore
index 882b67e2..a107f43f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,23 @@
 # ignore compiled byte code
 target
 
 # ignore output files from testing
 output*
 
-# ignore standard eclipse
+# ignore standard Eclipse files
 .project
 .classpath
 .settings
 .checkstyle
 
-# ignore standard intellij
+# ignore standard IntelliJ files
 .idea/
 *.iml
 *.iws
 
+# ignore standard Vim and Emacs temp files
+*.swp
+*~
+
+# ignore standard Mac OS X files/dirs
 .DS_Store