All of these changes in launcher.rb look okay to me, but @sosiouxme should eyeball them as well; he's done a lot more extensive work in here than I have.