Merge pull request #971 from jlipps/master

give the appium server a very big http socket timeout.
make sure chromedriver retries adb if it fails
fix #969