Adding puppet-merge for sockpuppet puppet merges.

puppet-merge will show fetched diffs of operations/puppet,
as well as any modified git submodules.

Change-Id: I37a4039233d8b683d54f6a17e2862d218ffd8643