0.20 cleanup

CRP and Karbonite bundling.  Dropped BahamutoD drills as those are
Kethane specific
Merge remote-tracking branch 'upstream/master'