working version ;)
Merge branch 'swarm' of github.com:cp2k/cp2k into swarm