jydoop to hadoop
Merge branch 'master' of https://github.com/mozilla-metrics/fhr-hadoop-hbase