Force travis (hopefully) to use the iphone simulator, and fix xcode's version of ocmock now it's in 'submodules'