Upgrading datastore stuff
Merge remote-tracking branch 'origin/ben/new_datastore'
Added dev and live yaml