Update osx

Added almost all settings I've wanted from Mathias' osx file.