Moved back to using environment variables to support Heroku deployment