Reconcile with burstlam's

Hopefully by reconciling with a working cm repo it will help exercise the deamons