Merge branch 'develop' into cp2k-plumed

* develop:
  remove nasty hack of commenting out actual configure command
  {chem}[intel/2015a] PLUMED 2.1.3
  don't hardwire Samcef version in sources
  {cae}[dummy] Samcef 17.0-03
  {tools}[dummy] EasyBuild 2.3.0