Some spacing and adding kaleidoscope as default merge tool