Don't install 32 bit zlib in travis builds

It shouldn't be necessary for anything in the build.
Merge pull request #352 from mstorsjo/simplify-travis-32bit

Don't install 32 bit zlib in travis builds
Merge remote-tracking branch 'upstream/master' into travis.osx

Conflicts:
	.travis.yml