Add armv7 and the new armv7s. Change the -arch option for xcode to allow matching the instructions-set if specified to make it easier to build from within Xcode.