diff --git a/.gitignore b/.gitignore
index a34a803..5653e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,14 @@
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
 # Testenvironment
 .tox/*
 
@@ -11,10 +22,5 @@ ChangeLog
 # Packages
 *.egg-info/*
 
-# Editors
-*~
-.*.swp
-.bak
-
 # For Mac Users
 .DS_Store