Merge pull request #23 from dstockton/master

Hierachial Puppetfiles