Upgrade hiera so it obeys pupppet log verbosity level
Remove conflicting join cluster directives
Merge branch 'feature/bootstrap' of github.com:davidl-zend/zendserverpuppet-vagrant into feature/bootstrap