(#20749) add keyword support to --install
(cleanup) tidied up the case statement structure
making parse_install_options not change in place
adding spec tests for parse_install_options
Merge pull request #444 from anodelman/install-keywords

(#20749) add keyword support to --install
Use/connect to 'vmhostname' if set
Provision VMs from templates with --vmrun vcloud
Clean-up (delete) dynamicly-provisioned VMs
Fail unless datastore, resource pool, and folder destinations are specified
Notes on new 'vcloud' --vmrun option
Re-wording
Merge pull request #445 from puppetlabs/template_deploy

Deploy dynamic VMs from templates
The index (i) was being redefined, but is needed for parallelization
Merge pull request #446 from puppetlabs/dont_redefine_i

The index (i) was being redefined in Ruby 1.8, but is needed for parallelization
Ensure the consoleport is always a string.

Previously, the consoleport would be a string if set by the
environment or a config file, but an integer if left at its
default. This changes the default to a string.

I'm changing the default to a string rather than converting the
env/cfg value to an integer because we have historically set the
consoleport in our config files, so this way it is less likely to
break things.
Merge pull request #449 from branan/consoleport_as_string

Ensure the consoleport is always a string.
Revert "Ensure the consoleport is always a string."

This was stupid. YAML creates integers automatically by default, so
unless the consoleport was set via ENV it would be an integer
previously. Making the default a string didn't do anything to unify
the values.

This reverts commit ec28d512cc068c54d3918d160b599e9917e431f1.
Force consoleport to always be an integer
Merge pull request #450 from branan/consoleport_as_integer

Force consoleport to always be an integer
Merge branch 'master' into vm-control-lib

Conflicts:
	setup/cleanup/00-vmrun.rb
	setup/early/00-vmrun.rb