a more robust merge script
a more robust merge script

When we can't look up a user's name or email the script fails. This will cause
it to default to the user's login.

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

cogitate/twitter-zipkin-uuid,thelastpickle/zipkin,jivesoftware/zipkin,fr0stbyte/zipkin,Yelp/zipkin,dsyer/zipkin,jfeltesse-mdsol/zipkin,xujianhai/zipkin,srijs/zipkin,rjbhewei/zipkin,prat0318/zipkin,mzagar/zipkin,jfeltesse-mdsol/zipkin,chang2394/zipkin,wuqiangxjtu/zipkin,fr0stbyte/zipkin,coursera/zipkin,mjwall/zipkin,zhoffice/zipkin,srijs/zipkin,wyzssw/zipkin,jfeltesse-mdsol/zipkin,zerdliu/zipkin,travisbrown/zipkin,hydro2k/zipkin,rocwzp/zipkin,yshaojie/zipkin,travisbrown/zipkin,baloo/zipkin,xujianhai/zipkin,srijs/zipkin,xujianhai/zipkin,eirslett/zipkin,pkoryzna/zipkin,hydro2k/zipkin,jamescway/zipkin,Flipkart/zipkin,chang2394/zipkin,drax68/zipkin,coursera/zipkin,coursera/zipkin,drax68/zipkin,eirslett/zipkin,Flipkart/zipkin,cogitate/twitter-zipkin-uuid,Yelp/zipkin,gneokleo/zipkin,c3p0hz/zipkin,drax68/zipkin,thelastpickle/zipkin,dsyer/zipkin,rjbhewei/zipkin,betable/zipkin,gneokleo/zipkin,wyzssw/zipkin,c3p0hz/zipkin,baloo/zipkin,jstanier/zipkin,rocwzp/zipkin,lqjack/zipkin,jivesoftware/zipkin,zhoffice/zipkin,dsyer/zipkin,jamescway/zipkin,fengshao0907/zipkin,drax68/zipkin,drax68/zipkin,mt0803/zipkin,jamescway/zipkin,fr0stbyte/zipkin,chang2394/zipkin,yshaojie/zipkin,lookout/zipkin,antmat/zipkin,antmat/zipkin,mzagar/zipkin,zhoffice/zipkin,rjbhewei/zipkin,wuqiangxjtu/zipkin,lqjack/zipkin,bbc/zipkin,jivesoftware/zipkin,thelastpickle/zipkin,travisbrown/zipkin,lookout/zipkin,lqjack/zipkin,prat0318/zipkin,wyzssw/zipkin,zerdliu/zipkin,wyzssw/zipkin,bbc/zipkin,gardleopard/zipkin,dsyer/zipkin,Yelp/zipkin,betable/zipkin,lookout/zipkin,jstanier/zipkin,prat0318/zipkin,baloo/zipkin,mt0803/zipkin,bbc/zipkin,bbc/zipkin,cogitate/twitter-zipkin-uuid,antmat/zipkin,drax68/zipkin,mzagar/zipkin,Flipkart/zipkin,mjwall/zipkin,betable/zipkin,travisbrown/zipkin,baloo/zipkin,zerdliu/zipkin,yshaojie/zipkin,srijs/zipkin,betable/zipkin,rjbhewei/zipkin,fengshao0907/zipkin,gardleopard/zipkin,mt0803/zipkin,dsyer/zipkin,mzagar/zipkin,jstanier/zipkin,hydro2k/zipkin,bbc/zipkin,gneokleo/zipkin,travisbrown/zipkin,thelastpickle/zipkin,zerdliu/zipkin,fengshao0907/zipkin,antmat/zipkin,Yelp/zipkin,lookout/zipkin,rocwzp/zipkin,travisbrown/zipkin,mjwall/zipkin,eirslett/zipkin,wuqiangxjtu/zipkin,c3p0hz/zipkin,pkoryzna/zipkin,cogitate/twitter-zipkin-uuid,zhoffice/zipkin,zerdliu/zipkin,lqjack/zipkin,c3p0hz/zipkin,yshaojie/zipkin,antmat/zipkin,eirslett/zipkin,chang2394/zipkin,jfeltesse-mdsol/zipkin,wuqiangxjtu/zipkin,prat0318/zipkin,lookout/zipkin,pkoryzna/zipkin,gneokleo/zipkin,cogitate/twitter-zipkin-uuid,jamescway/zipkin,Flipkart/zipkin,coursera/zipkin,bbc/zipkin,mt0803/zipkin,baloo/zipkin,wyzssw/zipkin,jstanier/zipkin,wyzssw/zipkin,gardleopard/zipkin,antmat/zipkin,cogitate/twitter-zipkin-uuid,rocwzp/zipkin,dsyer/zipkin,fengshao0907/zipkin,hydro2k/zipkin,xujianhai/zipkin,lookout/zipkin,zerdliu/zipkin