change the data directory references to "dev" and "prod" as opposed to
"dev2", "prod2"
Merge remote-tracking branch 'hmslincs/dave-sean-dev' into dave-sean-dev