distelli sudoers / server id

Add templatized sudoers setup for distelli
Merge upstream changes in

@christophercurrie