Merge branch 'master' into fast-wcsurface-2

.travis.yml

CHANGES/v2.2.txt

Makefile.conf.in

configure

configure.ac

developer-doc/Makefile

patches/gromacs-5.0.4.diff/src/gromacs/CMakeLists.txt

patches/gromacs-5.1.2.config

patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt

...s/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt.preplumed

patches/gromacs-5.1.2.diff/src/gromacs/mdlib/force.cpp

.../gromacs-5.1.2.diff/src/gromacs/mdlib/force.cpp.preplumed

patches/gromacs-5.1.2.diff/src/gromacs/mdlib/minimize.cpp

...omacs-5.1.2.diff/src/gromacs/mdlib/minimize.cpp.preplumed

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

...es/gromacs-5.1.2.diff/src/programs/mdrun/md.cpp.preplumed

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

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

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

...omacs-5.1.2.diff/src/programs/mdrun/repl_ex.cpp.preplumed