Merge remote-tracking branch 'origin/master'
Remove the grunt-cli from the local dev dependencies since it's already install globally