Do not merge
Puppet NTP, Do not merge
Merge pull request #12 from BrandtWilson/newdev

Puppet NTP