Fixed bower stuff, and grunt file