Follow changes in protoc-gen-go and grpc-go

Makefile

@@ -1,3 +1,8 @@
+# This is a Makefile which maintains files automatically generated but to be
+# shipped together with other files.
+# You don't have to rebuild these targets by yourself unless you develop
+# grpc-gateway itself.
+
 PKG=github.com/gengo/grpc-gateway
 GO_PLUGIN=bin/protoc-gen-go
 GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go
@@ -55,9 +60,11 @@ test: examples
 	go test $(PKG)/...
 
 clean distclean:
-realclean:
+	rm -f $(GATEWAY_PLUGIN)
+realclean: distclean
 	rm -f $(OPTIONS_GO)
 	rm -f $(EXAMPLE_SVCSRCS) $(EXAMPLE_DEPSRCS)
 	rm -f $(EXAMPLE_GWSRCS)
+	rm -f $(GO_PLUGIN)
 
 .PHONY: generate examples test clean distclean realclean

runtime/context_test.go

@@ -2,6 +2,7 @@ package runtime_test
 
 import (
 	"net/http"
+	"reflect"
 	"testing"
 
 	"github.com/gengo/grpc-gateway/runtime"
@@ -25,10 +26,10 @@ func TestAnnotateContext(t *testing.T) {
 	if !ok || len(md) != 2 {
 		t.Errorf("Expected 2 metadata items in context; got %v", md)
 	}
-	if md["Foobar"] != "Value1" {
-		t.Errorf("md[\"Foobar\"] = %v; want %v", md["Foobar"], "Value1")
+	if got, want := md["Foobar"], []string{"Value1"}; !reflect.DeepEqual(got, want) {
+		t.Errorf("md[\"Foobar\"] = %v; want %v", got, want)
 	}
-	if md["Foo-Baz"] != "Value2" {
-		t.Errorf("md[\"Foo-Baz\"] = %v want %v", md["Foo-Baz"], "Value2")
+	if got, want := md["Foo-Baz"], []string{"Value2"}; !reflect.DeepEqual(got, want) {
+		t.Errorf("md[\"Foo-Baz\"] = %v want %v", got, want)
 	}
 }