grunt 0.4 fixes

Not complete, but tested to work with Yeoman.