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