more cleanup including selendroid update
Merge pull request #1338 from jlipps/master

Massive refactor of ADB/Android code
missed some 'node server.js' updates
update appium.io
update appium.io again
Fix null args.app
Merge pull request #1341 from bootstraponline/master

Fix null args.app
refactor ios.js option passing
allow desired cap launchTimeout to tell appium how long to wait before declaring instruments unresponsive
retry getting a session in appium tests (fix #1326)
Merge pull request #1343 from jlipps/master

fix flakiness in getting session in appium testsuite
changelog and bump for publish 0.11.0
(Android) Don't uninstall the app on fast reset.
(Android) Fix for crash when there's no connected devices.
Merge pull request #1345 from paymand/fast_reset

(Android) Don't uninstall the app on fast reset.
fix launch timeout bug (fix #1340)
update travis to use newer node
switch around auth strategies (fix #1346)
fix unlock retry logic so we actually unlock (fix #1295)
Merge pull request #1347 from jlipps/master

fix unlock retry logic so we actually unlock