builde/vmware: skip adding floppy again in vmx_data_post step

website: add required value for openstack_provider for rackspace example

Merge branch 'additional-user-variables' of github.com:nBerg/packer into nBerg-additional-user-variables

Conflicts:
	builder/amazon/common/run_config.go

post-processor/vagrant: Change creating boxes for customizing metadata.json

provisioner/ansible: Fix Ansible inventory path on Windows

builder/amazon-instance: Debug the evaluated bundle commands

builder/amazonchroot: can build both PV and HVM images

builder/amazon-chroot: Fix bug with getting ec2 connection instead of source image

Merge branch 'master_add_support_for_tcg_accel_in_qemu_builder_' of github.com:mattthias/packer into mattthias-master_add_support_for_tcg_accel_in_qemu_builder_

Conflicts:
	builder/qemu/builder.go
	website/source/docs/builders/qemu.html.markdown

Conflicts:
	builder/qemu/step_run.go

builder/vmware: Add templating to VMware SSH host option

builder/parallels: Detect path to Parallels Tools ISO automatically

"guest_os_distribution" become deprecated and is not required anymore.
But if it is defined (in outdated templates),then the value will be copied to "guest_os_type" and warning will be displayed.

'parallels_tools_host_path' param is deprecated
'parallels_tools_flavor' is added (mandatory).

builder/openstack: error out when gets blank keypair

builder/qemu: add machine_type option for qemu builder.

builder/openstack: Make region not required if not rackspace

builder/amazon-instance: Use Region not S3Endpoint (see Issue 1424)

Updating check for version when on devel.

website: Updating Ubuntu 12.04 ISO location and checksum