Grunt file updated and npm stuff