More yeoman changes

/to @ritch please review