Merge in heroku-buildpack-nodejs-grunt-sass