Fix watch tasks and cleanup Gruntfile