diff --git a/Django.gitignore b/Django.gitignore
index 9e00fa46..4be94cb1 100644
--- a/Django.gitignore
+++ b/Django.gitignore
@@ -1,6 +1,3 @@
-*.swp
-*.swo
-*~
 #for python/django
 *.log
 static/uploaded/**/*
diff --git a/Global/emacs.gitignore b/Global/Emacs.gitignore
similarity index 71%
rename from Global/emacs.gitignore
rename to Global/Emacs.gitignore
index 69455a2f..472f6739 100644
--- a/Global/emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -1,4 +1,4 @@
-\#*#
+*~
+\#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
-.DS_Store
diff --git a/Global/Vi.gitignore b/Global/Vi.gitignore
new file mode 100644
index 00000000..d10a5fc7
--- /dev/null
+++ b/Global/Vi.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*.swo
\ No newline at end of file
diff --git a/Ruby.gitignore b/Ruby.gitignore
index 463c0603..6840c71f 100644
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -1,9 +1,4 @@
 .DS_Store
-*~
-\#*
-.\#*
-*.swp
-.*.swp
 coverage
 rdoc
 pkg