Fixed and finalised puppet config
Split puppet config into dev and deploy scripts