Grunt 0.4 and various clean up.