OSX branch synced to latest Kona
updated gitignore