Refactored the puppet module
Work in progress
Fixing up puppet module
Updated the deploy script to use the puppet module