Addpkg cleanup

This is on top of #37 .

Cleans up the code of git-cms-init and git-cms-addpkg.