Add Kaleidoscope as a merge tool
Set $EDITOR back to vim