A *little* update

Hey guys, here is a little update of the buildpack to follow the current modifications made on the original heroku repo.

I've made the merge and resolved the conflicts.

It's kind of big ^^ but I've only made the last 3 commits, the other ones are from the original repo.