Add more modules to Puppetfile
Merge branch 'master' into featurebranch
Use adrien/alternatives too