don't automatically add jobarray or queue lines to user template

In parallel launchers, the queue and jobarray lines should not be added
except in the default templates. user-templates must be fully specified.  This prevents conflicts between PBS versions, which may not support jobarrays, etc.

These lines are now only added to the *default* templates.

IPython/parallel/apps/launcher.py

@@ -869,6 +869,8 b' class BatchSystemLauncher(BaseLauncher):'
             # third (last) priority is default_template
             self.batch_template = self.default_template
         
+            # add jobarray or queue lines to user-specified template
+            # note that this is *only* when user did not specify a template.
         regex = re.compile(self.job_array_regexp)
         # print regex.search(self.batch_template)
         if not regex.search(self.batch_template):