diff --git a/.gitignore b/.gitignore
index 16368ef95b4e0276342a57526d9bdd3e44fe1348..f6c758169367381ddba19a47a5fa93ae788a190e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,3 @@
-# Eclipse workspace data
-.metadata/
-**/.settings
-**/.cproject
-**/.project
-**/Debug
-**/Debug*
-**/Release
-**/Release*
-
 # Compiled Object files
 *.slo
 *.lo
@@ -29,35 +19,7 @@
 *~
 *.swp
 
-debug/*
-release/*
-bin/*
-bin-release/*
-bin-debug/*
-lib/*
-lib-release/*
-lib-debug/*
 doc/*
-**/bin
-**/bin-release
-**/bin-debug
-**/release
-**/debug
-**/doc
-**/obj
-**/obj-release
-**/obj-debug
-**/lib
-**/lib-release
-**/lib-debug
-**/test-bin
-**/test-bin-release
-**/test-bin-debug
-**/test-obj
-**/test-obj-release
-**/test-obj-debug
-
-**/CppUnitTestResults.xml
 
 debug.sh
 release.sh
@@ -73,73 +35,20 @@ docs/userGuide/objs/*
 docs/userGuide/res/*
 docs/userGuide/command_doc.tex
 
-# Created by https://www.gitignore.io/api/clion+all
-
-### CLion+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# CMake
-cmake-build-debug/
+# our common build directories
+release/
+debug/
+build/
 
 # CMakeList.txt files are generated
 **/CMakeLists.txt
 CMakeLists.txt
 
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Ruby plugin and RubyMine
-/.rakeTasks
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### CLion+all Patch ###
-# Ignores the whole idea folder
-# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
-
+# CLion files
 .idea/
-cmake-build-debug-clang/
-cmake-build-debug/
-
 
-# End of https://www.gitignore.io/api/clion+all
+# Eclipse workspace data
+.metadata/
+**/.settings
+**/.cproject
+**/.project