.giconfig: replace mu with merge.* configuration

Use merge.ff = only and merge.defaultToUpstream = true.  This means that
a normal 'git m' will do what 'git mu' used to do.
.aspell.personal: update with a few more words