Refactor environment variable stuff to export, handle failures for both calls, rspec
Merge
Remove heroku.json