Fix merge conflicts from martell
Fixed minor typo in iscam.dat
Added WCVI shrimp trawl data.
fixed conflicts with cgrandin