Updated setup to work with Mavericks, additional packages added.