updating hiera folders/files
updating ruby defs
adding /etc/hosts entries
updating java 1.7 defs
adding developer configs
updating puppetfile with latest releases
adding temporary p4merge manifest
refactoring and cleaning hiera and manifests