Fixing tests for zipkin-hbase

The tests were written for the backwards-scanning behavior, and so they needed
updating with the changes in 3691ce2.

Author: @sethp-jive
Fixes #374
URL: https://github.com/twitter/zipkin/pull/374
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: @sprsquish
Fixes #375
URL: https://github.com/twitter/zipkin/pull/375
scala-tools.org is no longer serving up jars.

Author: @mjwall
Fixes #373
URL: https://github.com/twitter/zipkin/pull/373
account for timezone change

If the data was saved in a different timezone than the one it's being viewed, it
will not display correct results. This change will use the ISO 8601 format,
which the timeago jquery library knows how to handle.

Author: @fr0stbyte
Fixes #376
URL: https://github.com/twitter/zipkin/pull/376