Feature puppet

We should think about merging the puppet specific changes into master.  I've been testing awhile with both puppet and non-puppet environments and everything is working.