diff --git a/buildout.cfg b/buildout.cfg
index 88f3b0689c00e594af01c9e71af5cf4b822091e2..fbb60bf679150f0d45b18aeb166c5f6773723d92 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -20,19 +20,81 @@ eggs = bob.bio.face
 extensions = bob.buildout
              mr.developer
 auto-checkout = *
-develop = src/bob.bio.base
+develop = src/bob.extension
+          src/bob.blitz
+          src/bob.core
+          src/bob.io.base
+          src/bob.io.image
+          src/bob.learn.activation
+          src/bob.math
+          src/bob.learn.linear
+          src/bob.sp
+          src/bob.ip.base
+          src/bob.ip.color
+          src/bob.ip.draw
+          src/bob.ip.gabor
+          src/bob.learn.em
+          src/bob.measure
+          src/bob.db.base
+          src/bob.db.verification.utils
+          src/bob.db.verification.filelist
+          src/bob.db.atnt
+          src/bob.bio.base
+          src/bob.learn.boosting
+          src/bob.ip.facedetect
+          src/bob.ip.flandmark
+          src/bob.db.arface
+          src/bob.db.banca
+          src/bob.db.caspeal
           src/bob.db.frgc
+          src/bob.db.gbu
+          src/bob.db.lfw
+          src/bob.db.mobio
+          src/bob.db.multipie
+          src/bob.db.scface
+          src/bob.db.xm2vts
           .
-       
 
 ; options for bob.buildout
-debug = false
+debug = true
 verbose = true
 newest = false
 
 [sources]
+bob.extension = git https://github.com/bioidiap/bob.extension
+bob.blitz = git https://github.com/bioidiap/bob.blitz
+bob.core = git https://github.com/bioidiap/bob.core
+bob.io.base = git https://github.com/bioidiap/bob.io.base
+bob.io.image = git https://github.com/bioidiap/bob.io.image
+bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
+bob.math = git https://github.com/bioidiap/bob.math
+bob.sp = git https://github.com/bioidiap/bob.sp
+bob.ip.base = git https://github.com/bioidiap/bob.ip.base
+bob.ip.color = git https://github.com/bioidiap/bob.ip.color
+bob.ip.draw = git https://github.com/bioidiap/bob.ip.draw
+bob.ip.gabor = git https://github.com/bioidiap/bob.ip.gabor
+bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
+bob.learn.em = git https://github.com/bioidiap/bob.learn.em
+bob.measure = git https://github.com/bioidiap/bob.measure
+bob.db.base = git https://github.com/bioidiap/bob.db.base
+bob.db.verification.utils = git https://github.com/bioidiap/bob.db.verification.utils
+bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist
+bob.db.atnt = git https://github.com/bioidiap/bob.db.atnt
 bob.bio.base = git https://github.com/bioidiap/bob.bio.base
-bob.db.frgc = git https://github.com/bioidiap/bob.db.frgc
+bob.learn.boosting = git https://github.com/bioidiap/bob.learn.boosting
+bob.ip.facedetect = git https://github.com/bioidiap/bob.ip.facedetect
+bob.ip.flandmark = git https://github.com/bioidiap/bob.ip.flandmark
+
+bob.db.arface = git https://github.com/bioidiap/bob.db.arface
+bob.db.banca = git https://github.com/bioidiap/bob.db.banca
+bob.db.caspeal = git https://github.com/bioidiap/bob.db.caspeal
+bob.db.frgc = git https://github.com/bioidiap/bob.db.frgc 
+bob.db.gbu = git https://github.com/bioidiap/bob.db.gbu
+bob.db.lfw = git https://github.com/bioidiap/bob.db.lfw 
+bob.db.mobio = git https://github.com/bioidiap/bob.db.mobio
+bob.db.multipie = git https://github.com/bioidiap/bob.db.multipie
+bob.db.scface = git https://github.com/bioidiap/bob.db.scface
+bob.db.xm2vts = git https://github.com/bioidiap/bob.db.xm2vts
 
 [scripts]
 recipe = bob.buildout:scripts
diff --git a/develop.cfg b/develop.cfg
deleted file mode 100644
index fbb60bf679150f0d45b18aeb166c5f6773723d92..0000000000000000000000000000000000000000
--- a/develop.cfg
+++ /dev/null
@@ -1,101 +0,0 @@
-; vim: set fileencoding=utf-8 :
-; Manuel Guenther <manuel.guenther@idiap.ch>
-; Thu Oct  9 16:51:06 CEST 2014
-
-[buildout]
-parts = scripts
-eggs = bob.bio.face
-       bob.db.arface
-       bob.db.banca
-       bob.db.caspeal
-       bob.db.frgc
-       bob.db.gbu
-       bob.db.lfw
-       bob.db.mobio
-       bob.db.multipie
-       bob.db.scface
-       bob.db.xm2vts
-       gridtk
-       
-extensions = bob.buildout
-             mr.developer
-auto-checkout = *
-develop = src/bob.extension
-          src/bob.blitz
-          src/bob.core
-          src/bob.io.base
-          src/bob.io.image
-          src/bob.learn.activation
-          src/bob.math
-          src/bob.learn.linear
-          src/bob.sp
-          src/bob.ip.base
-          src/bob.ip.color
-          src/bob.ip.draw
-          src/bob.ip.gabor
-          src/bob.learn.em
-          src/bob.measure
-          src/bob.db.base
-          src/bob.db.verification.utils
-          src/bob.db.verification.filelist
-          src/bob.db.atnt
-          src/bob.bio.base
-          src/bob.learn.boosting
-          src/bob.ip.facedetect
-          src/bob.ip.flandmark
-          src/bob.db.arface
-          src/bob.db.banca
-          src/bob.db.caspeal
-          src/bob.db.frgc
-          src/bob.db.gbu
-          src/bob.db.lfw
-          src/bob.db.mobio
-          src/bob.db.multipie
-          src/bob.db.scface
-          src/bob.db.xm2vts
-          .
-
-; options for bob.buildout
-debug = true
-verbose = true
-newest = false
-
-[sources]
-bob.extension = git https://github.com/bioidiap/bob.extension
-bob.blitz = git https://github.com/bioidiap/bob.blitz
-bob.core = git https://github.com/bioidiap/bob.core
-bob.io.base = git https://github.com/bioidiap/bob.io.base
-bob.io.image = git https://github.com/bioidiap/bob.io.image
-bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
-bob.math = git https://github.com/bioidiap/bob.math
-bob.sp = git https://github.com/bioidiap/bob.sp
-bob.ip.base = git https://github.com/bioidiap/bob.ip.base
-bob.ip.color = git https://github.com/bioidiap/bob.ip.color
-bob.ip.draw = git https://github.com/bioidiap/bob.ip.draw
-bob.ip.gabor = git https://github.com/bioidiap/bob.ip.gabor
-bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
-bob.learn.em = git https://github.com/bioidiap/bob.learn.em
-bob.measure = git https://github.com/bioidiap/bob.measure
-bob.db.base = git https://github.com/bioidiap/bob.db.base
-bob.db.verification.utils = git https://github.com/bioidiap/bob.db.verification.utils
-bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist
-bob.db.atnt = git https://github.com/bioidiap/bob.db.atnt
-bob.bio.base = git https://github.com/bioidiap/bob.bio.base
-bob.learn.boosting = git https://github.com/bioidiap/bob.learn.boosting
-bob.ip.facedetect = git https://github.com/bioidiap/bob.ip.facedetect
-bob.ip.flandmark = git https://github.com/bioidiap/bob.ip.flandmark
-
-bob.db.arface = git https://github.com/bioidiap/bob.db.arface
-bob.db.banca = git https://github.com/bioidiap/bob.db.banca
-bob.db.caspeal = git https://github.com/bioidiap/bob.db.caspeal
-bob.db.frgc = git https://github.com/bioidiap/bob.db.frgc 
-bob.db.gbu = git https://github.com/bioidiap/bob.db.gbu
-bob.db.lfw = git https://github.com/bioidiap/bob.db.lfw 
-bob.db.mobio = git https://github.com/bioidiap/bob.db.mobio
-bob.db.multipie = git https://github.com/bioidiap/bob.db.multipie
-bob.db.scface = git https://github.com/bioidiap/bob.db.scface
-bob.db.xm2vts = git https://github.com/bioidiap/bob.db.xm2vts
-
-[scripts]
-recipe = bob.buildout:scripts
-dependent-scripts = true