Cleanups and tests
Properly handling images without extension
Merge branch 'develop' of github.com:mindsnacks/Zinc-ObjC into develop

Conflicts:
	Zinc-ObjC.xcodeproj/project.pbxproj