Bensch

Ok, I went out and got all of your updates and applied to my master.  I ended up having to delete my working branch and recreate it to make sure I could get things correct.  I've updated update.sh and setup.sh with the updates we talked about.