Forgot to add the actual changes to my previous commit....  Also, removed buildout.dumppickedversions from buildout.cfg, because if you run bootstrap with -d -v 2.1.1, then buildout complains that it's deprecated