dellis/rpearce: Added a new standard server, converted to machineset.
dellis/rpearce: Rename standard machine spec.