Changes to make the grunt file more sane.