Added delete support for groups, tidied list groupd template