Upgrade to new version of city_hash library.  This version has performance improvements, plus implements a variant with 32-bit output which will quiet some compiler warnings on win32.