Updated .osx

to the latest from Paul Irish, minus some stuff I don’t like