updated valueset parsing to throw error when attempting to use undeclared vs.  Updated description on data criteria and fixing or precondition conjunction_code bug