Update templates/Fedora-15-x86_64/definition.rb

Extending the sshtimeout to 10000 seconds cos it's too short at 100.
enable winrm client basic auth to fix winrm installation loop
Merge pull request #502 from marsmensch/master

fix winrm installation loop by activating client basic auth
Merge pull request #501 from tomduckering/patch-2

Update templates/Fedora-15-x86_64/definition.rb
correcting arch linux template
[KVM] Add support for alternate disk formats

Allows the user to define a Libvirt-supported disk_format
(ex. qcow2, raw, vmdk) in the definition.rb. Existing
templates that use the VDI disk_format will instead be
treated as 'raw'.
Merge pull request #507 from DavidWittman/kvm-disk-format

[KVM] Add support for alternate disk formats
Provide basic template and support to build ESXi 5.1 in VMware Fusion
Fix the halt command in VMware ESXi 5.1 template
Fix Debian-7.0-b4-amd64-netboot os_type_id

The Debian Wheezy (7.0-b4) os_type_id for amd64-netboot is incorrectly
set to 'Debian'. It should be 'Debian_64' to allow boot.
replacing dhcpcd and sshd startup script by collectd
Adds nfs script to enable NFS shares.
Adds NFS install script.
Merge pull request #512 from patcon/patch-1

Adds NFS install script to oracle linux
Merge pull request #506 from gcmalloc/master

Correction on the arch linux template
Merge pull request #509 from botimer/wheezy-amd64

Fix Debian-7.0-b4-amd64-netboot os_type_id
Merge pull request #503 from rheoli/master

Template Changes for OpenBSD / OpenIndiana
Merge pull request #508 from jasonberanek/esxi-templates

Support building ESXi on VMware Fusion