Added Wait feature to the multi-selector command

Also changed how default timeout is set so the value can remain 0 for
benefit of json serializing without default values.