Added support for selecting which kit storage mechanism to use using
"--enable-kit-storage={zip|mk4}"

Updated CPPFLAGS to include -I options for zlib, for consistency