Merge branch 'master' of github.com:nscoding/NSKit

Conflicts:
	NSKit.xcodeproj/project.pbxproj
	NSKit/Extensions/NSImage+NSKitExtensions.h