Update COMMITTERS with better format and new roles