Fixed missing callback parameter
Merge pull request #1370 from bicycleio/master

Missing callback parameter causing Appium to crash
fix for #1040
remove confusing multiple session handling code
it doesn't actually do anything and was cruft
also, make session overriding non-default based on the mobile
JSONWP discussions
check in midway through android startup/shutdown refactor
finish making shutdown() callback-based
command timeouts should be handled centrally by appium, not by each device
when we get an error starting up an android test, make sure we kill uiautomator
so it doesn't complain next time we run a test
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)
Merge pull request #1374 from jlipps/master

update ios auth logic (fix #1373)
add back desiredCaps.launch flag
add --log-timestamp and --log-no-colors options
also clean up and consolidate logging code
Merge pull request #1375 from jlipps/master

add back launch and some logging options
fiddle with some timeouts to account for older/slower emulators
and time testruns