Update khash.h to latest klib master