Add pointer to mergemaster.
Submitted by: Jaye Mathisen <mrcpu@internetcds.com>
Also minor formatting nits.