Added some defaults for OS X; git word diff