updating tasks to actually work with grunt
Merge remote-tracking branch 'origin/master'