updating for mcollective 2 and puppet3