Resetting author information
Merge branch 'master' of github.com:gotdoug/PuppetStuff