Updated skeleton code generator to remove CVSisms

Removed CVSism from skeletons and always specify __subsys__ when __pkgname__ is used.