Made changes to match the book puppet 3 beginner's guide
Merge branch 'master' of github.com:mikecando/puppet-dev

merging because of error while pulling