updates
Merge branch 'master' of https://github.com/kcmoot/grunt-tech-talk