Merge branch 'master' of https://github.com/mbcharbonneau/terraformer-objc

Conflicts:
	Terraformer.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/mbcharbonneau/terraformer-objc