Merge branch 'master' into merging-plumed-file-tool

I merged again from the master branch to keep it in sync.
There were a few conflicts which I solved in the latest
Gareth's stuff to fix units in DUMPATOMS.

Conflicts:
	src/GenericDumpAtoms.cpp