rebased against upstream?



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/heroku/heroku-buildpack-python/187)
<!-- Reviewable:end -->