Merge branch 'master' into fast-wcsurface-3

.travis.yml

CHANGES/Unreleased.txt

CHANGES/v2.2.txt

configure

configure.ac

developer-doc/mdTemplate.txt

patches/gromacs-4.6.7.config

patches/gromacs-4.6.7.diff/src/kernel/md.c

patches/gromacs-4.6.7.diff/src/kernel/mdrun.c

patches/gromacs-4.6.7.diff/src/kernel/repl_ex.c

patches/gromacs-4.6.7.diff/src/kernel/repl_ex.h

patches/gromacs-4.6.7.diff/src/kernel/repl_ex.h.preplumed

patches/gromacs-5.1.2.config

patches/gromacs-5.1.2.diff/src/programs/mdrun/md.cpp

patches/gromacs-5.1.2.diff/src/programs/mdrun/mdrun.cpp

patches/gromacs-5.1.2.diff/src/programs/mdrun/repl_ex.cpp

patches/gromacs-5.1.2.diff/src/programs/mdrun/repl_ex.h

...gromacs-5.1.2.diff/src/programs/mdrun/repl_ex.h.preplumed

patches/patch.sh

regtest/basic/rt-hrex-0/Makefile