Changed to using a single data directory for the yaml and json datastore. This makes it simpler to manage with puppet.
adjusting hiera datadir to allow for environments