if using bundle exec, -rbundler/setup fudges with RUBYOPT
Merge branch 'master' of git://github.com/heroku/heroku-buildpack-ruby