Gruntfile organization improvements