Merge pull request #1007 from jlipps/master

refactor and proxy fix
update appium.io and selendroid submodules
chrome fixes: eliminate race condition and make sure process ends