Gruntfile.js: merge checks & returns from brnach master
.travis.yml: merge updates from master
src/fyi-webkit.js: merge comment update from master