Updated to newer puppet.el