Tweaked script/setup.rb a bit