Does this mean that running chef-client will blow away any user_settings that have been hand edited in the file?  If so, then I think we should move the trusted peers to a separate file.