unify puppet configs
Merge branch 'master' of github.com:Eyjafjallajokull/gunnery