upgrade yo-gen, fix watch bugs on templates and nested dirs