Added fir cones, more tweaks to weed out old conifer/jungletree refs.
Changed fir models so that they include the new cones.