Update Gruntfile.js
Merge branch 'master' into initial-release
Updated README