diff --git a/.gitignore b/.gitignore
index 2fff79f2..50b1b37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,12 @@
+*.pyc
+*.egg-info
+build
 .coverage
-.venv
+.tox
+cover
 .testrepository
 subunit.log
-*,cover
-cover
-*.pyc
-.idea
-*.swp
-*~
 AUTHORS
-build
-dist
 ChangeLog
-run_tests.err.log
-.tox
-doc/source/api
+dist
 *.egg
-ceilometerclient/versioninfo
-python_ceilometerclient.egg-info
-*.log