Updated the puppet file and a few other bits and pieces to look more in line with the updated base repo.