fix up some version handling so we can use ios 7.0 with xcode 5.1 for example
Merge pull request #2286 from jlipps/master

fix up some version handling issues