[#4] Renaming of patchit to shepherd.
[#4] More shepherd renaming.
[#4] More shepherd renamings.
Fixed merge conflicts.