add diff.tool and merge.tool config
add a few mailboxes