Merge remote-tracking branch 'upstream/master'

Conflicts:
	Terraformer.xcodeproj/project.pbxproj
	Terraformer/TFFeature.h
	Terraformer/TFFeature.m
Fix problems from merge.
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

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

Fix merge issues.