Progress on parsing query.
Merge branch 'sclegion' of elmo.lanl.gov:gitlab/scout into sclegion
cleanup warnings
fix conflicts in merge with sclegion
Fix duplicate case.