Hiera rewrite

Bump to latest puppet and hiera in setup.pp
Fix regex in site.pp to match build-server.
Add contrib data to user.yaml
Remove node terminus from setup.pp