Tasks merged back into single Gruntfile