Rework Gruntfile and Tasks