Consolidated variables.  Added two tree types to the plantation
Merge branch 'master' of git://github.com/CSTARS/AHB-PNW