2010-11-15 - production
16:09	<Ryan_Lane>	added puppet.conf to puppet. pushing change out	[production]