diff --git a/.gitignore b/.gitignore
index 5dd7294d0db410a2f35b748517599800562afaa6..63ccdef52306e6441f46296a560caa8cf6a9429e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,65 +1,74 @@
-\#*\#
-.\#*
-/target
-/modules/drivers/*/target
-/lein-plugins/*/target
-/classes
-/checkouts
-pom.xml
-pom.xml.asc
-*.jar
 *.class
+*.iml
+*.jar
+*.log
+*.po~
+*.sqlite
+*.trace.db
+*.xcworkspacedata
+.DS_Store
+.\#*
+.eastwood
+.eastwood
+.idea/
+.idea/
+.nrepl-port
+.vscode
+/*.h2.db
+/*.lock.db
+/*.mv.db
+/*.trace.db
+/.babel_cache
+/.env
 /.lein-env
 /.lein-failures
 /.lein-plugins
 /.lein-repl-history
-.nrepl-port
-.idea/
+/.sqlite.db
+/backend-checksums.txt
+/build.xml
+/checkouts
+/classes
+/coverage
+/crate-*
+/deploy/artifacts/*
 /docs/uberdoc.html
-profiles.clj
-/*.h2.db
-/*.mv.db
-/*.lock.db
-/*.trace.db
+/lein-plugins/*/target
+/local/src
+/locales/metabase-*.pot
+/modules/drivers/*/target
+/node_modules/
+/osx-artifacts
+/plugins
+/reset-password-artifacts
 /resources/frontend_client/app/dist/
+/resources/frontend_client/app/locales
+/resources/frontend_client/embed.html
 /resources/frontend_client/index.html
 /resources/frontend_client/public.html
-/resources/frontend_client/embed.html
-/node_modules/
-/.babel_cache
-/coverage
 /resources/sample-dataset.db.trace.db
-/deploy/artifacts/*
 /resources/version.properties
-xcuserdata
-xcshareddata
-*.xcworkspacedata
+/screenshots
+/sqlite.db
+/stats.json
+/target
+/test-report-*
 OSX/Metabase/jre
 OSX/Resources/metabase.jar
 OSX/build
-/osx-artifacts
 OSX/dsa_priv.pem
+\#*\#
+bin/node_modules/
 bin/release/aws-eb/metabase-aws-eb.zip
-*.sqlite
-/reset-password-artifacts
-/.env
-/screenshots
-/plugins
-/build.xml
-/test-report-*
-/crate-*
-*.po~
-/locales/metabase-*.pot
-/stats.json
 coverage-summary.json
-.DS_Store
-bin/node_modules/
-*.log
-*.trace.db
-/backend-checksums.txt
-.vscode
+pom.xml
+pom.xml.asc
+profiles.clj
 target/checksum.txt
+xcshareddata
+xcuserdata
 /resources/frontend_client/app/locales
 *.iml
 .idea/
 /local/src
+/cypress