Upgrade grunt
Merge pull request #1 from shama/grunt

Upgrade grunt
update readme
Merge branch 'master' into gh-pages