Generator Updates

/cc @opscode/release-engineers @scotthain