Updates based on Grunt 0.4