puppet and chef

Restoring puppet.
Fixed chef version pinning.
Pinning puppet version to 3.1.x.