Various setup.sh fixes

This was failing on a brand new installation (worked fine for redeploying where it had already been used).  Some fixes.  Works here now on a brand new Ubuntu 12.04 install.
Ah, let me fix that; it was barfing entirely on my machine, causing the whole thing to fall over.  Forgot to go back and debug that beyond commenting it out.