diff --git a/.gitignore b/.gitignore
index e638a09ae21..648b93b0696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,92 +15,92 @@
 # specific language governing permissions and limitations
 # under the License.
 
-build/build.number
-.lock-wscript
-.waf-*
-waf-*
-target/
-override/
-.metadata
-dist/
 *~
+*_flymake.js
 *.bak
-cloud-*.tar.bz2
-*.log
-*.pyc
-*.patch
+*.css.map
 *.egginfo/
 *.egg-info/
-*.prefs
-build.number
-*.log.*
-cloud.log.*.*
-unittest
-deps/cloud.userlibraries
-.DS_Store
-.idea
 *.iml
-git-remote-https.exe.stackdump
-*.swp
-tools/devcloud/devcloudbox/.vagrant
-tools/cli/cloudmonkey/marvin/
-tools/cli/cloudmonkey/precache.py
-tools/marvin/marvin/cloudstackAPI/
-tools/marvin/build/
-tools/cli/build/
-tools/appliance/systemvmtemplate/packer_cache/
-*.jar
-*.war
-*.mar
 *.iso
+*.jar
+*.log
+*.log.*
+*.mar
+*.orig
+*.patch
+*.prefs
+*.pyc
+*.qcow2
+*.raw
+*.swp
 *.tar.gz
 *.tgz
 *.vscode
-*.css.map
+*.war
+.DS_Store
+.checkstyle
+.classpath
+.idea
+.lock-wscript
+.metadata
+.pmd
+.pmdruleset.xml
+.project
+.pydevproject
+.reviewboardrc
+.settings.xml
+.settings/
+.vscode
+.waf-*
+Gemfile.lock
+build/build.number
+build.number
+build-indep-stamp
+cloud.log.*.*
+cloud-*.tar.bz2
+configure-stamp
+db.properties.override
+debian/*.debhelper
+debian/*.substvars
+debian/cloudstack-*/*
+debian/files
+debian/tmp
+deps/cloud.userlibraries
+dist/
+docs/publish
+docs/runbook/publish
+docs/runbook/tmp
+docs/tmp
+engine/storage/integration-test/test-output
+git-remote-https.exe.stackdump
+node_modules
+override/
+plugins/hypervisors/kvm/.pydevproject
+plugins/network-elements/juniper-contrail/logs/
+replace.properties.override
+replace.properties.tmp
+scripts/.pydevproject
+scripts/vm/hypervisor/xenserver/vhd-util
+systemvm/.pydevproject
+target/
+target-eclipse
+test/.pydevprojec
+tools/apidoc/log/
+tools/appliance/box/
+tools/appliance/systemvmtemplate/packer_cache/
+tools/cli/build/
+tools/cli/cloudmonkey/marvin/
+tools/cli/cloudmonkey/precache.py
+tools/devcloud/devcloudbox/.vagrant
+tools/marvin/build/
+tools/marvin/marvin/cloudstackAPI/
+tools/marvin/marvin/cloudstackAPI/*
+unittest
+venv
+waf-*
 
 # this ignores _all files starting with '.'. Don't do that!
 #.*
 
-target-eclipse
 !.gitignore
-.classpath
-.settings.xml
-.settings/
-db.properties.override
-replace.properties.override
-tools/marvin/marvin/cloudstackAPI/*
-docs/tmp
-docs/publish
-docs/runbook/tmp
-docs/runbook/publish
-.project
-Gemfile.lock
-debian/tmp
-debian/files
-debian/cloudstack-*/*
-debian/*.substvars
-debian/*.debhelper
-replace.properties.tmp
-build-indep-stamp
-configure-stamp
-*_flymake.js
-engine/storage/integration-test/test-output
-tools/apidoc/log/
-plugins/network-elements/juniper-contrail/logs/
-scripts/vm/hypervisor/xenserver/vhd-util
-*.orig
-tools/appliance/box/
-.reviewboardrc
-.checkstyle
-.pmd
-.pmdruleset.xml
-.pydevproject
-systemvm/.pydevproject
-test/.pydevprojec
-plugins/hypervisors/kvm/.pydevproject
-scripts/.pydevproject
-*.qcow2
-*.raw
-venv
-node_modules
-.vscode