diff --git a/.gitignore b/.gitignore
index cdef1f3..08b7b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 *.egg-info
 dist
 build
+.eggs
 eggs
 parts
 bin
@@ -25,6 +26,8 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+.testrepository
+.venv
 
 # Translations
 *.mo
@@ -39,7 +42,16 @@ output/*.html
 output/*/index.html
 
 # Sphinx
-docs/_build
+doc/build
+
+# pbr generates these
+AUTHORS
+ChangeLog
+
+# Editors
+*~
+.*.swp
+.*sw?
 
 # Cookiecutter
 output/
diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore
index 8a3c704..e625780 100644
--- a/{{cookiecutter.repo_name}}/.gitignore
+++ b/{{cookiecutter.repo_name}}/.gitignore
@@ -8,6 +8,7 @@
 *.egg-info
 dist
 build
+.eggs
 eggs
 parts
 bin