Merge branch 'master' into b-govet

Makefile

@@ -14,6 +14,7 @@ generate:
 	go generate ./...
 
 test:
+	@echo "Running tests on:"; git symbolic-ref HEAD; git rev-parse HEAD
 	go test $(TEST) $(TESTARGS) -timeout=10s
 	@$(MAKE) vet
 
@@ -29,6 +30,7 @@ testrace:
 	go test -race $(TEST) $(TESTARGS)
 
 updatedeps:
+	@echo "Updating deps on:"; git symbolic-ref HEAD; git rev-parse HEAD
 	go get -u github.com/mitchellh/gox
 	go get -u golang.org/x/tools/cmd/stringer
 	go list ./... \
@@ -37,8 +39,10 @@ updatedeps:
 		| grep -v '/internal/' \
 		| sort -u \
 		| xargs go get -f -u -v
+	@echo "Finished updating deps, now on:"; git symbolic-ref HEAD; git rev-parse HEAD
 
 vet:
+	@echo "Running go vet on:"; git symbolic-ref HEAD; git rev-parse HEAD
 	@go vet 2>/dev/null ; if [ $$? -eq 3 ]; then \
 		go get golang.org/x/tools/cmd/vet; \
 	fi

website/source/docs/other/debugging.html.markdown

@@ -20,9 +20,9 @@ usually will stop between each step, waiting for keyboard input before
 continuing. This will allow you to inspect state and so on.
 
 In debug mode once the remote instance is instantiated, Packer will emit to the
-current directory an emphemeral private ssh key as a .pem file. Using that you
+current directory an ephemeral private ssh key as a .pem file. Using that you
 can `ssh -i <key.pem>` into the remote build instance and see what is going on
-for debugging. The emphemeral key will be deleted at the end of the packer run
+for debugging. The ephemeral key will be deleted at the end of the packer run
 during cleanup.
 
 ### Windows