diff --git a/.gitignore b/.gitignore
index 201255f3d141..51ab4183a556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,37 @@
+*.DS_Store
+*.egg*
+*.log
+*.mo
+*.pyc
+*.swo
+*.swp
+*.sqlite
 .autogenerated
 .coverage
 .nova-venv
 .project
 .pydevproject
+.ropeproject
 .tox
 .venv
 AUTHORS
 Authors
-CA/
-ChangeLog
-MANIFEST
 build-stamp
 build/*
+CA/
+ChangeLog
 coverage.xml
 cover/*
 covhtml
 dist/*
+doc/source/api/*
+doc/build/*
 instances
 keeper
 keys
 local_settings.py
+MANIFEST
 nosetests.xml
 nova/tests/cover/*
 nova/vcsversion.py
 tools/conf/nova.conf*
-*.log
-*.mo
-*.pyc
-*.sqlite
-*.DS_Store
-*.egg*
-*.sw[po]
-.project
-.pydevproject
-doc/source/api/*
-doc/build/*