Fixed Grunt file again, and moved favicon