cloud2ovf: Rework by templating a real-world VMWare OVF

Rather than try to massage an OVF which works for RHEV-M into one that
works with VMWare, let's just take a VMWare XML file, strip the crud
out, and turn it back into a template.

Also, fix the disk size computation.