Initial dist subtree commit
Fixing Yeoman build issues