more consolidation
Merge branch 'master' of https://github.com/johnlev/Cypher

Conflicts:
	Cypher.xcodeproj/project.pbxproj