Fix merge from forks
Fix merge from forks

Author: da39a3ee5e6b4b0d3255bfef95601890afd80709@franklinhu
Fixes #78
URL: https://github.com/twitter/zipkin/pull/78

c3p0hz/zipkin,jstanier/zipkin,wadey/zipkin,antmat/zipkin,baloo/zipkin,fulinlin924/zipkin,elbiczel/zipkin,bbc/zipkin,jstanier/zipkin,gneokleo/zipkin,fr0stbyte/zipkin,lqjack/zipkin,Trott/zipkin,Flipkart/zipkin,baloo/zipkin,zerdliu/zipkin,suchang/zipkin,dsyer/zipkin,tangyang/zipkin,fr0stbyte/zipkin,mjwall/zipkin,jstanier/zipkin,eirslett/zipkin,thelastpickle/zipkin,gardleopard/zipkin,eirslett/zipkin,drax68/zipkin,elbiczel/zipkin,wyzssw/zipkin,gneokleo/zipkin,Trott/zipkin,c3p0hz/zipkin,lookout/zipkin,jamescway/zipkin,hydro2k/zipkin,betable/zipkin,viktortnk/zipkin,coursera/zipkin,Flipkart/zipkin,thelastpickle/zipkin,chang2394/zipkin,rocwzp/zipkin,pkoryzna/zipkin,travisbrown/zipkin,c3p0hz/zipkin,jaredlwong/zipkin,drax68/zipkin,zerdliu/zipkin,travisbrown/zipkin,zhoffice/zipkin,shijinkui/zipkin,menghan/zipkin,xujianhai/zipkin,antmat/zipkin,wuqiangxjtu/zipkin,travisbrown/zipkin,mt0803/zipkin,cogitate/twitter-zipkin-uuid,mjwall/zipkin,zerdliu/zipkin,chang2394/zipkin,zhoffice/zipkin,fulinlin924/zipkin,AnSavvides/zipkin,eirslett/zipkin,dsyer/zipkin,jivesoftware/zipkin,yshaojie/zipkin,shijinkui/zipkin,betable/zipkin,menghan/zipkin,frenchfrywpepper/zipkin,mt0803/zipkin,cogitate/twitter-zipkin-uuid,WuErPing/zipkin,jstanier/zipkin,tumblr/zipkin,suchang/zipkin,dsyer/zipkin,menghan/zipkin,drax68/zipkin,mosesn/zipkin,jaredlwong/zipkin,wuqiangxjtu/zipkin,fengshao0907/zipkin,shaiguitar/zipkin,thefactory/zipkin,hydro2k/zipkin,dsyer/zipkin,capttwinky/zipkin,gneokleo/zipkin,prat0318/zipkin,travisbrown/zipkin,jfeltesse-mdsol/zipkin,dsyer/zipkin,pkoryzna/zipkin,mzagar/zipkin,nshkrob/zipkin,tangyang/zipkin,lookout/zipkin,Yelp/zipkin,jfeltesse-mdsol/zipkin,coursera/zipkin,coursera/zipkin,ambroff/zipkin,wadey/zipkin,ambroff/zipkin,mzagar/zipkin,shaiguitar/zipkin,Flipkart/zipkin,AnSavvides/zipkin,Yelp/zipkin,viktortnk/zipkin,suchang/zipkin,mzagar/zipkin,cogitate/twitter-zipkin-uuid,mt0803/zipkin,thefactory/zipkin,srijs/zipkin,WuErPing/zipkin,prat0318/zipkin,gneokleo/zipkin,wyzssw/zipkin,wuqiangxjtu/zipkin,jivesoftware/zipkin,yshaojie/zipkin,jamescway/zipkin,capttwinky/zipkin,rocwzp/zipkin,tumblr/zipkin,drax68/zipkin,nshkrob/zipkin,baloo/zipkin,ambroff/zipkin,zerdliu/zipkin,mzagar/zipkin,jivesoftware/zipkin,AnSavvides/zipkin,c3p0hz/zipkin,jamescway/zipkin,travisbrown/zipkin,rocwzp/zipkin,gardleopard/zipkin,zhoffice/zipkin,thelastpickle/zipkin,antmat/zipkin,travisbrown/zipkin,yshaojie/zipkin,eirslett/zipkin,lookout/zipkin,jaredlwong/zipkin,baloo/zipkin,lookout/zipkin,samstokes/zipkin,wadey/zipkin,jamescway/zipkin,frenchfrywpepper/zipkin,antmat/zipkin,baloo/zipkin,Flipkart/zipkin,dsyer/zipkin,shijinkui/zipkin,zerdliu/zipkin,srijs/zipkin,fengshao0907/zipkin,lqjack/zipkin,mjwall/zipkin,nshkrob/zipkin,zhoffice/zipkin,WuErPing/zipkin,jfeltesse-mdsol/zipkin,wyzssw/zipkin,prat0318/zipkin,zerdliu/zipkin,rjbhewei/zipkin,Trott/zipkin,Yelp/zipkin,bbc/zipkin,wyzssw/zipkin,cogitate/twitter-zipkin-uuid,mosesn/zipkin,fengshao0907/zipkin,wuqiangxjtu/zipkin,rocwzp/zipkin,fulinlin924/zipkin,xujianhai/zipkin,viktortnk/zipkin,gardleopard/zipkin,cogitate/twitter-zipkin-uuid,bbc/zipkin,coursera/zipkin,rjbhewei/zipkin,xujianhai/zipkin,bbc/zipkin,elbiczel/zipkin,hydro2k/zipkin,bbc/zipkin,samstokes/zipkin,antmat/zipkin,lqjack/zipkin,thelastpickle/zipkin,wyzssw/zipkin,betable/zipkin,yshaojie/zipkin,mt0803/zipkin,cogitate/twitter-zipkin-uuid,Yelp/zipkin,rjbhewei/zipkin,lookout/zipkin,pkoryzna/zipkin,tangyang/zipkin,prat0318/zipkin,chang2394/zipkin,srijs/zipkin,jfeltesse-mdsol/zipkin,antmat/zipkin,shaiguitar/zipkin,drax68/zipkin,lqjack/zipkin,samstokes/zipkin,lookout/zipkin,capttwinky/zipkin,srijs/zipkin,frenchfrywpepper/zipkin,bbc/zipkin,hydro2k/zipkin,drax68/zipkin,xujianhai/zipkin,tumblr/zipkin,chang2394/zipkin,wyzssw/zipkin,mosesn/zipkin,betable/zipkin,fr0stbyte/zipkin,thefactory/zipkin,fengshao0907/zipkin,rjbhewei/zipkin