set of proposed changes

This is as requested in issue #646. It's still work in progress.

vsphere4 upload won't currently work.
Suffixes are not yet implemented.
Automatic naming works, cfme_data changed to support upload to all providers.

TODO: Test upload to vsphere5 & vsphere55 from my test rig.