add ability to set launch timeout from the command line so it can be used in conjunction with pre-launch
Merge pull request #1662 from jlipps/master

add ability to set launch timeout from the command line so it can be use...