Clean Gruntfile, improve grunt tasks