Get rid of commented-out code and spacing changes.
Merge branch 'master' into arc

Conflicts:
	XCodeProjectData/Demo-OSX/SKSVGObject.h
Use ARC's declaration.