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