Switch to using our own branch of the OSX module
Additional OSX settings