Fleshing out server group, type, and template ideas
Merge remote-tracking branch 'origin/master'