Grunt 0.4 updates - not fully tested.