merge with cirlabs/heroku-buildpack-geodjango