Work in profress, update to rpm spec, puppet manifests