Merge pull request go-kit#330 from basvanbeek/master follow opentracing-go refactoring of HTTPHeadersCarrier

Merge pull request go-kit#287 from go-kit/addsvc-errors examples/addsvc: more sophisticated error encoding