Move merge functions to merge.c

In so doing, promote commit_list to git_commit_list,
with its own internal API header.
Format/documentation tweaks for merge.h
API updates for message.h
API updates for net.h
API updates for notes.h/c.