Merge branch 'fix-zero-clusters' of https://github.com/plumed/plumed2 into fix-zero-clusters

src/crystallization/InterMolecularTorsions.cpp

@@ -72,7 +72,7 @@ void InterMolecularTorsions::registerKeywords( Keywords& keys ){
                                "The following provides information on the \\ref switchingfunction that are available. "
                                "When this keyword is present you no longer need the NN, MM, D_0 and R_0 keywords.");
   // Use actionWithDistributionKeywords
-  keys.remove("LOWMEM");
+  keys.remove("LOWMEM"); keys.remove("DATA");
   keys.addFlag("LOWMEM",false,"lower the memory requirements");
 }
 

src/multicolvar/MultiColvarHistogram.cpp

@@ -118,7 +118,7 @@ MultiColvarHistogram::MultiColvarHistogram(const ActionOptions&ao):
   std::vector<std::string> args(1); args[0] = mycolv->getLabel();
   gg = new Grid(funcl,args,str_min,str_max,nbins,true,true,true,pbc,str_min,str_max);
 
-  log.printf(" for colvars calculated by action %s \n",mycolv->getLabel().c_str() );
+  log.printf("  for colvars calculated by action %s \n",mycolv->getLabel().c_str() );
 
   parse("OFILE",filename); 
   if(filename.length()==0) error("name out output file was not specified");