Hbase merge

totally untested as of now but this merges up asynchbase 9a6f32fef1d98acc08a6a2bc983eefb9869c0b5d

@lzheng @sandbreaker