preparing for heroku
using dotenv to DRY up api host
fixed merge conflict