Cleaned buildout.cfg and dev.cfg a bit, updated to bootstrap 2.0