Updated for OSX Mavericks

I haven't had the ability to thoroughly test these updates.