Merging changes to demonstrate puppet configuration