Merging in master, upgrading puppet code to 1.0 arch