make kinit work on OS X
OS X updates
OS X merge