Updating to use multi-buildpack, cleaning stuff