Update CCI

Add Dave and incorporate D-Star into CCI rather than have it as a
separate project.