Merge branch 'v2.1' into v2.2

.travis.yml

@@ -30,11 +30,11 @@ matrix:
 #   VALGRIND=yes to make valgrind tests, only when log contains string [valgrind]
 install:
 # setup environment to allow install on the home directory
-  - export PATH="$PATH:$HOME/opt/bin"
-  - export CPATH="$CPATH:$HOME/opt/include"
-  - export INCLUDE="$INCLUDE:$HOME/opt/include"
-  - export LIBRARY_PATH="$LIBRARY_PATH:$HOME/opt/lib"
-  - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/opt/lib"
+  - export PATH="$HOME/opt/bin:$PATH"
+  - export CPATH="$HOME/opt/include:$CPATH"
+  - export INCLUDE="$HOME/opt/include:$INCLUDE"
+  - export LIBRARY_PATH="$HOME/opt/lib:$LIBRARY_PATH"
+  - export LD_LIBRARY_PATH="$HOME/opt/lib:$LD_LIBRARY_PATH"
 # build the manual, only if log contains string [makedoc]
   - export PLUMED_NUM_THREADS=2
   - ./.travis/check.log makedoc  || MAKEDOC=no

.travis/install.cppcheck

@@ -16,8 +16,11 @@ else
 fi
 
 
-git checkout $tag
+git checkout $version
 make -j 4 install CFGDIR="$HOME/opt/share/cppcheck/" CXXFLAGS="-O2 -march=native -mtune=native -Wunreachable-code" PREFIX="$HOME/opt"
 cd ../
 
+cppcheck --version
+
+