Added option -simulator for specifying which simulator to launch, either "iphone" or "ipad". Defaults to "iphone" which is the old behavior.