Migrate pull request from chrisolof over to new cookbook