upgrade cityhash
rename cityhash dependency
simplify makefile a bit