First commit in osx branch for Mac OS X specific settings