Merge pull request #1358 from thomasvl/travis_tweaks

Mark iOS tests as able to fail.