Added Grunt as a dependency; squashed some bugs.