diff --git a/.gitconfig b/.gitconfig
index 252b1e3..6b10d39 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,3 +10,5 @@
 [difftool "vimdiff"]
 	cmd = mvimdiff
 	path = /Users/hunner/local/bin/mvimdiff
+[core]
+	excludesfile = /Users/hunner/.gitignore_global
diff --git a/.gitignore_global b/.gitignore_global
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore_global
@@ -0,0 +1 @@
+*.swp
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 7a00288..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule ".vim/bundle/Gundo"]
-	path = .vim/bundle/Gundo
-	url = https://github.com/vim-scripts/Gundo.git
-[submodule ".vim/bundle/ShowMarks"]
-	path = .vim/bundle/ShowMarks
-	url = https://github.com/vim-scripts/ShowMarks.git