Update to bring in line with Tim's buildpack