Updated yaml_helper_spec and yaml_helper to detect merge conflicts with the supplied YAML. Also made distinction on YAMLHelper methods.. i.e. string v file
clean up from previous test adjustments
updated remaining specs, corrected necessary code to accomodate new #load_string and #load_file methods on YAMLHelper