hand edits to make names in CWSAC I and CWSAC II correspond to each other
added data from NPS CWSS database
Merge branch 'vsc'