Imported more configuration options from .osx to the osx-startup script.