Resolve merge conflicts from merging upstream
Merge Gemfile conflicts from upstream merge
Adds README
Adds hiera example configs
Add docs
Add/update scripts
Update site manifest
Update gem caches
Update puppet caches