Format changes
Merge branch 'master' of github.com:ksylvan/puppet
Merge branch 'master' of github.com:ksylvan/puppet