updated podspec for new version
Merge remote-tracking branch 'instructure/CanvasKit/master'

Conflicts:
	CanvasKit.podspec
prevent the cascading failed masquerade of death
Merge pull request #150 from derrh/master

Prevent the cascading failed masquerade of death