Separate local and production deploys
Fix merge conflicts
Fix merge conflicts
Set up dev environment variables