Adjust amalgamation to target OS X only
Updates sqlcipher.xcodeproj ARCH settings for iOS builds to $(ARCHS_STANDARD) + armv7s
Merge branch 'master' into prerelease