Merge: More solution and project cleaning.

Conflicts:
	OpenImageIO/OpenImageIO.vcxproj