Fixed all OSX compile errors, changed FNV related stuff to be called HASH since we may not use FNV after all.
Merged recent Win32 changes, need to re-run flex/bison on Win32 to fix last remaining compiler issue