spin kickstart/minimization cleanups

[Bill Nottingham]

Chris Adams (cmadams at hiwaay.net) said: 
> Not commenting on the naming, but I'd put UPS tools on desktops as well.
> Lots of people have UPSes attached to home computers, while I only have
> a single server monitoring an UPS (datacenter with a big UPS and
> generator, the monitoring is just for Nagios to tell us if there's a
> problem).

Desktops, yes. Laptops, not really. (Although doing the groups by
form-factors isn't really practical.)

Bill