Basic config from the book + little puppet-lint cleanup