More heroku work, ruby 2.x support