Merge with phonegap

Fixed the issue with implictly turning on debug for -c instead of -L

ios-deploy.c

@@ -1723,10 +1723,10 @@ int main(int argc, char *argv[]) {
         case 'L':
             interactive = false;
             justlaunch = true;
+            debug = 1;
             break;
         case 'c':
             detect_only = true;
-            debug = 1;
             break;
         case 'V':
             show_version();