Merge pull request #426 from joshsamuelson/master

Fixing conflict
This is why we run puppet parser validate
Merge pull request #427 from joshsamuelson/typo

This is why we run puppet parser validate