Add docstring to cb-git:add
Add autoloads
Move git merge function into ediff config to fix compiler warnings