Making relevant changes from our-boxen to help with mavericks install.