Changes for 1.2 Beta 3

NOTE: Started including zlib but have not yet referenced it.