A few fixes to be more clear on licence
Merge branch 'molfiles-module' of github.com:plumed/plumed2 into molfiles-module

Conflicts:
	src/molfile/import.sh