pull a ton of updates from puppet repo master branch