test commit: added ALGAE to parse_veg_type.c
Added SCM command line flag, moved scm outflow computation to compute_stage_storage
corrected conflicts with makefile merge
merged my scm changes with newstrata, ready to push