minor vagrant, puppet updates
whole puppet manifests refactoring
add locales fix
Merge branch 'master' of github.com:Eyjafjallajokull/gunnery-vagrant