user cmake builtin search for zlib and png
makeBaseName is const now
Merge branch 'api_change' of github.com:DerOrfa/isis into api_change

Conflicts:
	lib/ImageIO/CMakeLists.txt