Merge http://github.com/allending/Kiwi into update

Conflicts:
	Classes/KWExample.m
	Kiwi.xcodeproj/project.pbxproj