Move the position of the rsync alias

... to use the version installed by brew in /usr/local/bin
=merge.summary= has been deprecated in favor of =merge.log=