Reorganizing environment variables to get things running on heroku.