merge mcollective-choria into this and retire mcollective-choria #8
Description
Doing it this way means the 100s of file resources that now makes peoples puppets slow will vanish and we'll have one pile of ruby to support for the related mcollective stuff
Eventually the mco shim and some other bits will come in here too but pulling in mcollective choria will be a big win