Updated make aliases and added one for play
More puppet config files
Fix merge conflict