Merge pull request #1 from thongsav-usgs/CCHS-19

Cchs 19
Cleaned up lidar/shapefile detection and branching.