Update Gruntfile
Merge remote-tracking branch 'origin/master' into popup
Update README
Merge remote-tracking branch 'origin/popup' into linkurious-version