Merge branch 'gh-pages'
Update grunt tasks
Merge branch 'master' into gh-pages