Merge branch 'v2.0'

CHANGES/v2.0.txt

@@ -111,8 +111,8 @@ For users:
 - Now compiles on Blue Gene Q with IBM compilers.
 - Fixed bug in \ref CENTER where default WEIGHTS were missing. 
 - Several small fixes in documentation and log file.
-- Fixed broken CONTACTMAP with SUM
-- Added CMDIST in CONTACTMAP to emulate plumed1 CMAP.
+- Fixed broken \ref CONTACTMAP with SUM
+- Added CMDIST in \ref CONTACTMAP to emulate plumed1 CMAP.
 
 For developers:
 - Fixed cmd("getBias") to retrieve bias. It was not working with

regtest/basic/rt28/plumed.dat

@@ -31,7 +31,7 @@ LABEL=c
 
 PRINT ...
   ARG=a,b,c.contact1,c.contact5
-  FILE=COLVAR
+  FILE=colvar
 ... PRINT
 
 DUMPDERIVATIVES ARG=a,b FILE=deriv FMT=%8.6f