Align Chef/Puppet/Salt references

Also, add salt to all of them.