CORE: Reverted zlib changes for now since it broke 64bit.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar