Merge remote-tracking branch 'origin/master' into patch-1

builder/googlecompute/driver_gce.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"code.google.com/p/google-api-go-client/compute/v1"
-	"github.com/golang/oauth2"
-	"github.com/golang/oauth2/google"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
 	"github.com/mitchellh/packer/packer"
 )
 

website/source/docs/builders/vmware-iso.html.markdown

@@ -228,7 +228,7 @@ each category, the available options are alphabetized and described.
   `tools_upload_flavor`. By default the upload path is set to
   `{{.Flavor}}.iso`.
 
-* `version` (string) - The [vmx hardware version](http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1003746) for the new virtual machine.  Only the default value has been tested, any other value is expiermental.  Default value is '9'.
+* `version` (string) - The [vmx hardware version](http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1003746) for the new virtual machine.  Only the default value has been tested, any other value is experimental.  Default value is '9'.
 
 * `vm_name` (string) - This is the name of the VMX file for the new virtual
   machine, without the file extension. By default this is "packer-BUILDNAME",