update grunt tasks and package.json
Merge branch 'master' of github.com:twote/twote_site