diff --git a/.gitignore b/.gitignore
index 882b67e2ec0e1a624c962e90d86272828b6f0cb4..a107f43f9daf3a5e20979ab020326e9a20b8f610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,15 +4,20 @@ 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