Add Kaleidoscope as the default diff and merge tool for git
Force pylab to use osx backend by default

When using python with pylab and Qt as backend there are recurrent freezes