Add cityhash, a good and fast hash.
Remove typedef redefined which break linux build
Merge pull request #34 from Xele02/master

Linux build broke correction