Mostly yeoman template code commit