Updates to fix compatibility with grunt-0.4.0rc6+