fix for #1040
Merge pull request #1371 from drpy/master

fix for #1040
Merge pull request #1372 from jlipps/master

Cleanup/refactor of appium/android startup/shutdown
update ios auth logic (fix #1373)