Fixed grunt build so that it's more true to how grunt does task management.