Updating grunt tasks
Merge branch 'master' of https://github.com/davetheflashguy/build-demo