Grunt 0.4 updates - not fully tested. #2 #3