change YamlDataStore.java so it can compile under Java 6. Added "yaml" as a datastore option which should use the new Data Store.