Use Mash so things can be appendend and enabled easier.
Remove the extra pagerduty attributes file, and place it right in the server.rb attributes.
Merge in patches