Going with setuptools 1.1, buildout 2.2.0 instead.
diff --git a/GettingStarted.wiki b/GettingStarted.wiki
index e41e4b4..c9c5ded 100644
--- a/GettingStarted.wiki
+++ b/GettingStarted.wiki
@@ -19,9 +19,7 @@
 {{{
 git clone http://code.google.com/p/soc/
 cd soc
-# This specific version of setuptools works around an issue with setuptools and distribute
-# http://stackoverflow.com/q/17586987/87279
-python bootstrap.py -d -v 2.1.1
+python bootstrap.py -v 2.1.1
 bin/buildout
 bin/gen-app-yaml local-devel
 bin/paver build --skip-pylint