Chococraft and HarvestCraft changes

Refactored Chococraft to be in a single package.  HarvestCraft perennials now behave as they do in pam's mods.