Oss sync

re-sync fixing the bad conflict resolutions.

Author: @sprsquish
Fixes #377
URL: https://github.com/twitter/zipkin/pull/377