Work to try to fix issue #50

I have changed the name of the virtual function so there
shouldn't be a clash anymore
Merge branch 'master' of github.com:plumed/plumed2