Update osx_defaults to be a little more reliable and fixup the dock