Merging with heroku's master and caching for grunt-cli

I am not sure if it's best way to do this, but it works =)