Merge pull request #972 from jlipps/master

make sure chromedriver retries adb if it fails
--ipa and --app aren't actually incompatible. --ipa needs --app to provide bundleId