Merge branch 'master' into multi-all

Conflicts:
	swiftmpifakestepsim.c
	swiftmpistepsim.c

swiftmpistepsim.c

@@ -516,6 +516,7 @@ int main(int argc, char *argv[]) {
         waitns = atoll(optarg);
       case 'c':
         messagescale = atof(optarg);
+        break;
       case 's':
         messagesize = atoll(optarg);
         break;
@@ -562,10 +563,9 @@ int main(int argc, char *argv[]) {
     if (messagesize > 0)
       message("Using fixed message size of %zd", messagesize);
     if (messagescale != 1.0f)
-      message("Using message scale of %g", messagescale);
+      message("Using message scale of %f", messagescale);
     if (!usetics) message("Using fast untimed injections");
     if (datacheck) message("Checking data pattern on send and recv completion");
-    message("");
   }
 
   /* Make three types of thread, one for injecting tasks and two to check for