Grunt & npm setup
Fixed grunt tasks